Snap for 8564071 from cbcbe039c667e0cda484ade233864bc5438dd6df to mainline-tethering-release
Change-Id: Ibaac20d71d060fffb3aec7f266aeb7929ce57783
diff --git a/Android.bp b/Android.bp
index ecc8ca0..514fc87 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --features=std,clock.
+// 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_chrono_license"],
@@ -34,6 +35,8 @@
name: "libchrono",
host_supported: true,
crate_name: "chrono",
+ cargo_env_compat: true,
+ cargo_pkg_version: "0.4.19",
srcs: ["src/lib.rs"],
edition: "2015",
features: [
@@ -47,10 +50,8 @@
"libnum_integer",
"libnum_traits",
],
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
}
-
-// dependent_library ["feature_list"]
-// autocfg-1.0.1
-// libc-0.2.85 "default,std"
-// num-integer-0.1.44
-// num-traits-0.2.14 "default,std"
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..2ae3abf
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,31 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+ "presubmit": [
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "libcert_request_validator_tests"
+ },
+ {
+ "name": "microdroid_manager_test"
+ }
+ ],
+ "presubmit-rust": [
+ {
+ "name": "libapkverify.integration_test"
+ },
+ {
+ "name": "libapkverify.test"
+ },
+ {
+ "name": "libcert_request_validator_tests"
+ },
+ {
+ "name": "microdroid_manager_test"
+ }
+ ]
+}
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..90c5a67
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "device": true,
+ "features": "std,clock",
+ "run": true
+}
