summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 22:16:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 22:16:36 +0000
commit74072a0a38a2c7b5e781d5d40bb59c8df79a8b28 (patch)
tree1cd484251542bce79720d6eed273e01af7f1665e
parentb79467f98d7eecd3db35dd79174d758b95d76639 (diff)
parenta23b3a5669d7d29de4247a4dcd3054da4bf2e81b (diff)
downloadshared_library-74072a0a38a2c7b5e781d5d40bb59c8df79a8b28.tar.gz
Merge "Add apex to shared_library rust crate" am: 3c14340e07 am: 8cdc8ed1d7 am: e1065611b1 am: a23b3a5669
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_library/+/1850762 Change-Id: I3a11f5fbb0efc14036d0dc6af107f026b7b6dcd2
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json4
2 files changed, 8 insertions, 2 deletions
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 @@ rust_library {
"liblazy_static",
"liblibc",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_defaults {
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,