Snap for 7325096 from d13c5afe1e2140f474e4f278e4a739b69410c621 to sc-d1-release
Change-Id: I9c9fc6b2802f95a71cae30f59d3dbc2072d1b50c
diff --git a/Android.bp b/Android.bp
index 267573d..0dfc4bc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies --tests --patch=patches/Android.bp.diff.
+// 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_libm_license"],
@@ -65,6 +66,9 @@
rust_test_host {
name: "libm_host_test_src_lib",
defaults: ["libm_defaults"],
+ test_options: {
+ unit_test: true,
+ },
}
rust_test {
@@ -73,8 +77,8 @@
}
// dependent_library ["feature_list"]
-// no-panic-0.1.14
-// proc-macro2-1.0.24 "default,proc-macro"
-// quote-1.0.7 "default,proc-macro"
-// syn-1.0.54 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
+// no-panic-0.1.15
+// proc-macro2-1.0.26 "default,proc-macro"
+// quote-1.0.9 "default,proc-macro"
+// syn-1.0.70 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
// unicode-xid-0.2.1 "default"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..911c36f
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,11 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.resolv"
+ ],
+ "dependencies": true,
+ "device": true,
+ "min-sdk-version": "29",
+ "run": true,
+ "tests": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff
deleted file mode 100644
index 003ea83..0000000
--- a/patches/Android.bp.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- Android.bp 2020-12-14 19:07:52.362403999 +0900
-+++ Android.bp.new 2020-12-14 19:07:02.566865770 +0900
-@@ -7,4 +7,9 @@ rust_library {
- srcs: ["src/lib.rs"],
- edition: "2018",
- features: ["default"],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.resolv",
-+ ],
-+ min_sdk_version: "29",
- }
