Merge TP1A.211116.001
Change-Id: If0f95fb78b5b5637e41762e4d5701faecde069f5
diff --git a/Android.bp b/Android.bp
index 0ddc73c..c38a2e0 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_cesu8_license"],
}
@@ -41,6 +39,8 @@
crate_name: "cesu8",
// has rustc warnings
srcs: ["src/lib.rs"],
+ cargo_env_compat: true,
+ cargo_pkg_version: "1.1.0",
test_suites: ["general-tests"],
auto_gen_config: true,
edition: "2015",
@@ -68,4 +68,9 @@
cargo_pkg_version: "1.1.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