diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:24 +0000 |
commit | 734bfb58189cbe04f10590792442be22b79bdf51 (patch) | |
tree | 87a8aab98a66595cccf5a7c95c7db70e8d5d51a6 | |
parent | 989bf4953b33df8853e6a9914c7d48648dd43af7 (diff) | |
parent | b3008f9912924a19ad64903ead5f7606c39cd9a5 (diff) | |
download | ryu-android12L-d2-s4-release.tar.gz |
Generate apex_available from c2a instead of a patch am: 9e820487be am: 3138d28955 am: d0d7463c51 am: b3008f9912android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/ryu/+/1689359
Change-Id: Id53c42e638708d40f6e3dc69180a9eb2df830c8f
-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", -+ ], - } |