summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-08 21:48:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 21:48:37 +0000
commite1065611b1e6dbb4feec5b8add448a63b8239e44 (patch)
tree1cd484251542bce79720d6eed273e01af7f1665e
parent07468cccf0eb0a94f3e9ee62ce945e067ea4f7c9 (diff)
parent8cdc8ed1d7219a5c6d79df4cf3816cda3bad400c (diff)
downloadshared_library-e1065611b1e6dbb4feec5b8add448a63b8239e44.tar.gz
Merge "Add apex to shared_library rust crate" am: 3c14340e07 am: 8cdc8ed1d7
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/shared_library/+/1850762 Change-Id: Iab75d1a8458e92ce8cf2e410ce4e999d41a95bb4
-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,