Adjustments for android12-gsi

Drop some older workarounds and use common_crosvm from external/crosvm.

Bug: 216827224
Change-Id: Icf1a04b15e23ada4793e940041b4549590c16adf

3 files changed, 31 insertions, 51 deletions

diff --git a/Android.bp b/Android.bp
index 0f7c225..cc8c3f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,108 +15,100 @@
 // limitations under the License.
 
 cc_prebuilt_binary {
-  name: "common_crosvm",
-  stem: "crosvm",
-  srcs: ["scripts/crosvm"],
-  defaults: ["cuttlefish_host_only"],
-}
-// 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"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   name: "aarch64_linux_gnu_libdrm.so.2_for_crosvm",
   srcs: ["aarch64-linux-gnu/bin/libdrm.so.2"],
   stem: "libdrm.so.2",
   relative_install_path: "aarch64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   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"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   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"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   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"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   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"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   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"],
+  defaults: ["cuttlefish_host"],
 }
 cc_prebuilt_binary {
   name: "x86_64_linux_gnu_crosvm",
   srcs: ["x86_64-linux-gnu/bin/crosvm"],
   stem: "crosvm",
   relative_install_path: "x86_64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   name: "x86_64_linux_gnu_libdrm.so.2_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libdrm.so.2"],
   stem: "libdrm.so.2",
   relative_install_path: "x86_64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   name: "x86_64_linux_gnu_libepoxy.so.0_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libepoxy.so.0"],
   stem: "libepoxy.so.0",
   relative_install_path: "x86_64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   name: "x86_64_linux_gnu_libgbm.so.1_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libgbm.so.1"],
   stem: "libgbm.so.1",
   relative_install_path: "x86_64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   name: "x86_64_linux_gnu_libgfxstream_backend.so_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libgfxstream_backend.so"],
   stem: "libgfxstream_backend.so",
   relative_install_path: "x86_64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   name: "x86_64_linux_gnu_libminijail.so_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libminijail.so"],
   stem: "libminijail.so",
   relative_install_path: "x86_64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
-cc_prebuilt_binary {
+cc_prebuilt_library {
   name: "x86_64_linux_gnu_libvirglrenderer.so.1_for_crosvm",
   srcs: ["x86_64-linux-gnu/bin/libvirglrenderer.so.1"],
   stem: "libvirglrenderer.so.1",
   relative_install_path: "x86_64-linux-gnu",
-  defaults: ["cuttlefish_host_only"],
+  defaults: ["cuttlefish_host"],
 }
diff --git a/gen_android_bp.sh b/gen_android_bp.sh
index af5b274..0bbcb14 100755
--- a/gen_android_bp.sh
+++ b/gen_android_bp.sh
@@ -150,17 +150,6 @@ function gen_android_bp4seccomp() {
 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
-
-EOF
-
 for i in */bin/*; do
   if [[ ! -L "$i" ]]; then
     name="${i//\//_}"
@@ -171,14 +160,17 @@ for i in */bin/*; do
 
     if [[ "crosvm" != "${stem}" ]]; then
       name="${name}_for_crosvm"
+      module_type=cc_prebuilt_library
+    else
+      module_type=cc_prebuilt_binary
     fi
 
-    gen_module "cc_prebuilt_binary" '  ' \
+    gen_module "${module_type}" '  ' \
     --name="\"${name}\"" \
     --srcs="[\"$i\"]" \
     --stem="\"$stem"\" \
     --relative_install_path="\"${path}\"" \
-    --defaults="[\"cuttlefish_host_only\"]"
+    --defaults="[\"cuttlefish_host\"]"
   fi
 done
 }
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")" "${@}"