summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Macnak <natsu@google.com>2021-10-14 21:12:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-14 21:12:09 +0000
commit39d360b4b1f6ee1581a14b88e7e0c0addb55165d (patch)
treea0d89b5bbbb6e918a99f86fc4f9eae6c51bb33cf
parent810487c23a16a792b572df40845cf3a656689259 (diff)
parentc5fee2bf33fb1edf913941fb36059a7e3710d82f (diff)
downloadlock_api-39d360b4b1f6ee1581a14b88e7e0c0addb55165d.tar.gz
Add apex to lock_api rust crate am: a8edef88b0 am: c4bda063cc am: 016ae2eb4e am: fde5ccdbfa am: c5fee2bf33
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/lock_api/+/1854091 Change-Id: I2924c26aeb6a7f52e88fe1bd833ebc30f351b5ec
-rw-r--r--Android.bp6
-rw-r--r--cargo2android.json9
2 files changed, 14 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 8f93604..8b145a9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --device --tests.
+// This file is generated by cargo2android.py --config cargo2android.json.
// Do not modify this file as changes will be overridden on upgrade.
package {
@@ -48,6 +48,10 @@ rust_library {
rustlibs: [
"libscopeguard",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
rust_defaults {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d28888a
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "run": true,
+ "tests": true
+} \ No newline at end of file