Remove prebuilt modules for crosvm/arm64

Soong prebuilt module definitions for the crosvm/arm64 binaries are
removed because they are now built from source code.

common_crosvm script is moved to external/crosvm because that's a better
place than here.

gen_android_bp.sh was slightly modified to not create the deleted Soong
module definitions.

Finally, the existing prebuilts are removed because nobody uses it
anymore.

Bug: 159685774
Test: m cvd-host_package
Change-Id: I24a82fac803d4d9d1a6496738254324e1cc76495

14 files changed, 0 insertions, 90 deletions

diff --git a/Android.bp b/Android.bp
index db45101..183c89c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,65 +14,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-sh_binary_host {
-  name: "common_crosvm",
-  filename: "crosvm",
-  target: {
-    linux_glibc: {
-      src: "scripts/crosvm",
-    },
-    darwin: {
-      src: "scripts/crosvm",
-    },
-    linux_bionic: {
-      src: "scripts/crosvm_bionic",
-    },
-  },
-}
-// NOTE: Using cc_prebuilt_binary because cc_prebuilt_library can't handle stem on pie
-
-cc_prebuilt_binary {
-  name: "aarch64_linux_gnu_crosvm",
-  srcs: ["aarch64-linux-gnu/bin/crosvm"],
-  stem: "crosvm",
-  relative_install_path: "aarch64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
-}
-cc_prebuilt_binary {
-  name: "aarch64_linux_gnu_libepoxy.so.0_for_crosvm",
-  srcs: ["aarch64-linux-gnu/bin/libepoxy.so.0"],
-  stem: "libepoxy.so.0",
-  relative_install_path: "aarch64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
-}
-cc_prebuilt_binary {
-  name: "aarch64_linux_gnu_libgbm.so.1_for_crosvm",
-  srcs: ["aarch64-linux-gnu/bin/libgbm.so.1"],
-  stem: "libgbm.so.1",
-  relative_install_path: "aarch64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
-}
-cc_prebuilt_binary {
-  name: "aarch64_linux_gnu_libminijail.so_for_crosvm",
-  srcs: ["aarch64-linux-gnu/bin/libminijail.so"],
-  stem: "libminijail.so",
-  relative_install_path: "aarch64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
-}
-cc_prebuilt_binary {
-  name: "aarch64_linux_gnu_libvirglrenderer.so.0_for_crosvm",
-  srcs: ["aarch64-linux-gnu/bin/libvirglrenderer.so.0"],
-  stem: "libvirglrenderer.so.0",
-  relative_install_path: "aarch64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
-}
-cc_prebuilt_binary {
-  name: "aarch64_linux_gnu_libvirglrenderer.so.1_for_crosvm",
-  srcs: ["aarch64-linux-gnu/bin/libvirglrenderer.so.1"],
-  stem: "libvirglrenderer.so.1",
-  relative_install_path: "aarch64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
-}
 cc_prebuilt_binary {
   name: "x86_64_linux_gnu_libandroid_emu_shared.so_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libandroid-emu-shared.so"],
diff --git a/aarch64-linux-gnu/bin/crosvm b/aarch64-linux-gnu/bin/crosvm
deleted file mode 100755
index 6e8aa36..0000000
--- a/aarch64-linux-gnu/bin/crosvm
+++ /dev/null
diff --git a/aarch64-linux-gnu/bin/libdrm.so.2 b/aarch64-linux-gnu/bin/libdrm.so.2
deleted file mode 100755
index 6a1b743..0000000
--- a/aarch64-linux-gnu/bin/libdrm.so.2
+++ /dev/null
diff --git a/aarch64-linux-gnu/bin/libepoxy.so b/aarch64-linux-gnu/bin/libepoxy.so
deleted file mode 120000
index 7cebfbf..0000000
--- a/aarch64-linux-gnu/bin/libepoxy.so
+++ /dev/null
@@ -1 +0,0 @@
-libepoxy.so.0
\ No newline at end of file
diff --git a/aarch64-linux-gnu/bin/libepoxy.so.0 b/aarch64-linux-gnu/bin/libepoxy.so.0
deleted file mode 100755
index 88bd3b2..0000000
--- a/aarch64-linux-gnu/bin/libepoxy.so.0
+++ /dev/null
diff --git a/aarch64-linux-gnu/bin/libgbm.so b/aarch64-linux-gnu/bin/libgbm.so
deleted file mode 120000
index 93a9fe6..0000000
--- a/aarch64-linux-gnu/bin/libgbm.so
+++ /dev/null
@@ -1 +0,0 @@
-libgbm.so.1
\ No newline at end of file
diff --git a/aarch64-linux-gnu/bin/libgbm.so.1 b/aarch64-linux-gnu/bin/libgbm.so.1
deleted file mode 100755
index 3966844..0000000
--- a/aarch64-linux-gnu/bin/libgbm.so.1
+++ /dev/null
diff --git a/aarch64-linux-gnu/bin/libminijail.so b/aarch64-linux-gnu/bin/libminijail.so
deleted file mode 100755
index 816a1aa..0000000
--- a/aarch64-linux-gnu/bin/libminijail.so
+++ /dev/null
diff --git a/aarch64-linux-gnu/bin/libvirglrenderer.so b/aarch64-linux-gnu/bin/libvirglrenderer.so
deleted file mode 120000
index a764d77..0000000
--- a/aarch64-linux-gnu/bin/libvirglrenderer.so
+++ /dev/null
@@ -1 +0,0 @@
-libvirglrenderer.so.1
\ No newline at end of file
diff --git a/aarch64-linux-gnu/bin/libvirglrenderer.so.0 b/aarch64-linux-gnu/bin/libvirglrenderer.so.0
deleted file mode 100755
index dd6a697..0000000
--- a/aarch64-linux-gnu/bin/libvirglrenderer.so.0
+++ /dev/null
diff --git a/aarch64-linux-gnu/bin/libvirglrenderer.so.1 b/aarch64-linux-gnu/bin/libvirglrenderer.so.1
deleted file mode 100755
index 4a5eb42..0000000
--- a/aarch64-linux-gnu/bin/libvirglrenderer.so.1
+++ /dev/null
diff --git a/gen_android_bp.sh b/gen_android_bp.sh
index f85936a..9a43dce 100755
--- a/gen_android_bp.sh
+++ b/gen_android_bp.sh
@@ -32,13 +32,6 @@ function check_location() {
 
 my_name=`basename $0`
 
-# define arch dir pattern: e.g. ${ARCH}-linux-gnu
-function get_arch_dir() {
-  local suffix="-linux-gnu"
-  local arch=$1
-  echo ${arch}${suffix}
-}
-
 # take arch, return the path of the output Android.bp file
 function get_output_file() {
   local blueprint_dir=$1
@@ -116,12 +109,6 @@ function gen_module() {
 function gen_main_android_bp() {
   gen_license 2019
 
-  gen_module "cc_prebuilt_binary" '  ' \
-    --name="\"common_crosvm\"" \
-    --stem="\"crosvm"\" \
-    --srcs="[\"scripts/crosvm\"]" \
-    --defaults="[\"cuttlefish_host_only\"]"
-
   cat <<EOF
 // NOTE: Using cc_prebuilt_binary because cc_prebuilt_library can't handle stem on pie
 
diff --git a/scripts/crosvm b/scripts/crosvm
deleted file mode 100755
index 6b4029a..0000000
--- a/scripts/crosvm
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export LD_PRELOAD=libdrm.so.2
-exec "$(dirname "$0")/$(uname -m)-linux-gnu/$(basename "$0")" "${@}"
diff --git a/scripts/crosvm_bionic b/scripts/crosvm_bionic
deleted file mode 100644
index f378a25..0000000
--- a/scripts/crosvm_bionic
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Execute crosvm using the Bionic linker. This is because DT_INTERP of the
-# host rust binaries are incorrectly set to /system/bin/linker64. The path
-# doesn't exist on host targets, but this is unavoidable because we are
-# building the host rust binaries using "-target aarch64-linux-android".
-# The target is for Android and therefore DT_INTERP is set to that of Android.
-# We have to use the target until rustc supports non-Android target using Bionic
-# as libc. Until then, let's override DT_INTERP by executing the dynamic linker
-# and feed the absolute path to the rust binary as the first argument.
-$(dirname $0)/linker64 $(readlink -f $(dirname $0)/$(uname -m)-linux-bionic/$(basename "$0")) "${@}"