diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-11-09 16:06:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-11-09 16:06:02 +0000 |
| commit | ec96fa28158a593f48a525768bda03aa299cd793 (patch) | |
| tree | 89ed3b4a4eea1e7c00e7a9540906221c73b1fb93 | |
| parent | 9937c78ec2c52ac2e590c891370e059db6527c33 (diff) | |
| parent | c46b2b7689f1b84cf9c51d4d015dc3b83efca414 (diff) | |
| download | jni-sys-ec96fa28158a593f48a525768bda03aa299cd793.tar.gz | |
Add apex_available. am: 30a3cc11e4 am: b6b93f035b am: c46b2b7689
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/jni-sys/+/1874495
Change-Id: Ibb07b39bbb434ad631e1bdc40f34dafea769e0e9
| -rw-r--r-- | Android.bp | 31 | ||||
| -rw-r--r-- | cargo2android.json | 10 |
2 files changed, 16 insertions, 25 deletions
@@ -1,8 +1,6 @@ -// 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 { default_applicable_licenses: ["external_rust_crates_jni-sys_license"], } @@ -39,28 +37,6 @@ license { ], } -rust_defaults { - name: "jni-sys_test_defaults", - crate_name: "jni_sys", - srcs: ["src/lib.rs"], - test_suites: ["general-tests"], - auto_gen_config: true, - edition: "2015", -} - -rust_test_host { - name: "jni-sys_host_test_src_lib", - defaults: ["jni-sys_test_defaults"], - test_options: { - unit_test: true, - }, -} - -rust_test { - name: "jni-sys_device_test_src_lib", - defaults: ["jni-sys_test_defaults"], -} - rust_library { name: "libjni_sys", host_supported: true, @@ -69,4 +45,9 @@ rust_library { cargo_pkg_version: "0.3.0", srcs: ["src/lib.rs"], edition: "2015", + apex_available: [ + "//apex_available:platform", + "com.android.uwb", + ], + min_sdk_version: "29", } diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..728c976 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.uwb" + ], + "device": true, + "min_sdk_version": "29", + "run": true, + "tests": true +}
\ No newline at end of file |