diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:19:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:19:49 +0000 |
commit | 3138d28955f4dfa8161cc4c9a2d9f378a2c9c5b4 (patch) | |
tree | 87a8aab98a66595cccf5a7c95c7db70e8d5d51a6 | |
parent | 883e02361e74b2380792ae26bd6ee6a8cb80d1d7 (diff) | |
parent | 9e820487be49c86e3e07d37c8cfaf740ead092e3 (diff) | |
download | ryu-android-s-beta-4.tar.gz |
Generate apex_available from c2a instead of a patch am: 9e820487beandroid-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ryu/+/1689359
Change-Id: I1379896de7369c66cbe8070ac699fa4cbca4daf3
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 14 insertions, 17 deletions
@@ -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 @@ rust_library { 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", -+ ], - } |