commit b564adcea3d8e57cec0b56fe8fb890adf994ba42
author Treehugger Robot <treehugger-gerrit@google.com> Fri Oct 08 22:32:07 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Oct 08 22:32:07 2021 +0000
tree 1cd484251542bce79720d6eed273e01af7f1665e
parent ffc255a29daf500fe4c50ac1a3ec7958163bd626
parent 74072a0a38a2c7b5e781d5d40bb59c8df79a8b28

Merge "Add apex to shared_library rust crate" am: 3c14340e07 am: 8cdc8ed1d7 am: e1065611b1 am: a23b3a5669 am: 74072a0a38

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_library/+/1850762

Change-Id: Iff43add49b4288ec9cc97a552b50fc7aad6e385c

Android.bp

diff --git a/Android.bp b/Android.bp
index 73e0c17..9db6e2d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: [
         "external_rust_crates_shared_library_license",
@@ -53,6 +51,10 @@
         "liblazy_static",
         "liblibc",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.virt",
+    ],
 }
 
 rust_defaults {

cargo2android.json

diff --git a/cargo2android.json b/cargo2android.json
index aefdfbd..9a0499e 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,4 +1,8 @@
 {
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.virt"
+  ],
   "device": true,
   "run": true,
   "tests": true,