Snap for 7325276 from b3008f9912924a19ad64903ead5f7606c39cd9a5 to sc-release
Change-Id: I4fc1210269a140e6073e79c7eaad06c133a294dc
diff --git a/Android.bp b/Android.bp
index 1aa4ba0..d32ed19 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// 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_ryu_license"],
@@ -44,9 +45,9 @@
crate_name: "ryu",
srcs: ["src/lib.rs"],
edition: "2018",
- flags: [
- "--cfg integer128",
- "--cfg maybe_uninit",
+ cfgs: [
+ "integer128",
+ "maybe_uninit",
],
apex_available: [
"//apex_available:platform",
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..42b7833
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,9 @@
+{
+ "apex-available": [
+ "//apex_available:platform",
+ "com.android.virt"
+ ],
+ "dependencies": true,
+ "device": true,
+ "run": true
+}
\ No newline at end of file
diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch
deleted file mode 100644
index 343b704..0000000
--- a/patches/Android.bp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Android.bp b/Android.bp
-index bbb0114..e47c45a 100644
---- a/Android.bp
-+++ b/Android.bp
-@@ -10,4 +10,8 @@ rust_library {
- "--cfg integer128",
- "--cfg maybe_uninit",
- ],
-+ apex_available: [
-+ "//apex_available:platform",
-+ "com.android.virt",
-+ ],
- }
