aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Hsieh <victorhsieh@google.com>2021-05-14 23:12:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-05-14 23:12:29 +0000
commit50fa36f6986ecd99d36c9554ee8fabc3db867121 (patch)
tree13373b6c2133f4e1636449e47e1bec6b71069fee
parentf2acc027b973c0adc4761defda2f73782547e8f0 (diff)
parent992964e32d6c0ee71cd6ca89b7a27666074e61d9 (diff)
downloadscopeguard-50fa36f6986ecd99d36c9554ee8fabc3db867121.tar.gz
Make available to com.android.compos apex am: a58e6cd01b am: 992964e32d
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/scopeguard/+/1705756 Change-Id: I41f36535b7c1090de48535805c86135dedbabeb3
-rw-r--r--Android.bp10
-rw-r--r--cargo2android.json10
2 files changed, 19 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 27af338..22c0043 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// 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_scopeguard_license"],
@@ -46,6 +47,10 @@ rust_library {
"default",
"use_std",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.compos",
+ ],
}
rust_defaults {
@@ -64,6 +69,9 @@ rust_defaults {
rust_test_host {
name: "scopeguard_host_test_src_lib",
defaults: ["scopeguard_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..de91d5d
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,10 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.compos"
+ ],
+ "dependencies": true,
+ "device": true,
+ "run": true,
+ "tests": true
+} \ No newline at end of file