aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-11 02:04:27 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-11 02:04:27 +0000
commit08255a9bfe51f38d0949d61ee67c12d79b7d1c70 (patch)
tree4c8ffc4542fb55a846b5c0b8cdd1f67597bbd718
parent5b15233f52dfe4895c551c6b54fe8d93bfcf7e90 (diff)
parent2540bb1bcb0638c650e116532c31d9e7ef16f387 (diff)
downloadjni-sys-08255a9bfe51f38d0949d61ee67c12d79b7d1c70.tar.gz
Snap for 7904124 from 2540bb1bcb0638c650e116532c31d9e7ef16f387 to sdk-release
Change-Id: Ibae93df67c57c0d0cdb0cd94da26ce658ff51db9
-rw-r--r--Android.bp11
-rw-r--r--cargo2android.json10
2 files changed, 18 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp
index 5c4f7ec..c9cf3b0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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"],
}
@@ -43,6 +41,8 @@ rust_defaults {
name: "jni-sys_test_defaults",
crate_name: "jni_sys",
srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.3.0",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2015",
@@ -69,4 +69,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