Fix cargo_embargo.json for jni-0.20.0 and regenerate Android.bp.
Bug: http://b/339424309
Test: treehugger
Change-Id: I4b618196a2549555cb845225a862cbdaa2c5bf54
diff --git a/0.20.0/Android.bp b/0.20.0/Android.bp
index c080821..b0498d8 100644
--- a/0.20.0/Android.bp
+++ b/0.20.0/Android.bp
@@ -1,16 +1,16 @@
+// This file is generated by cargo_embargo.
+// Do not modify this file because the changes will be overridden on upgrade.
+
package {
- default_applicable_licenses: ["external_rust_crates_jni_0_20_0_license"],
+ default_applicable_licenses: ["external_rust_crates_jni-0.20.0_license"],
+ default_team: "trendy_team_android_rust",
}
license {
- name: "external_rust_crates_jni_0_20_0_license",
+ name: "external_rust_crates_jni-0.20.0_license",
visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- ],
- license_text: [
- "LICENSE",
- ],
+ license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+ license_text: ["LICENSE"],
}
rust_library {
@@ -19,7 +19,7 @@
crate_name: "jni",
cargo_env_compat: true,
cargo_pkg_version: "0.20.0",
- srcs: ["src/lib.rs"],
+ crate_root: "src/lib.rs",
edition: "2018",
features: ["default"],
rustlibs: [
diff --git a/0.20.0/cargo_embargo.json b/0.20.0/cargo_embargo.json
index 9b3ad03..ecc8451 100644
--- a/0.20.0/cargo_embargo.json
+++ b/0.20.0/cargo_embargo.json
@@ -3,6 +3,9 @@
"//apex_available:platform",
"com.android.uwb"
],
- "min_sdk_version": "29",
- "tests": true
+ "module_name_overrides": {
+ "libjni": "libjni_legacy",
+ "external_rust_crates_jni_license": "external_rust_crates_jni-0.20.0_license"
+ },
+ "min_sdk_version": "29"
}
