diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:08 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:08 +0000 |
commit | 1625b06478efa52c5e5d2c42087e82dcf993851f (patch) | |
tree | 87a8aab98a66595cccf5a7c95c7db70e8d5d51a6 | |
parent | 815f1d8e0bd758b0957a2ae32577997658897fa1 (diff) | |
parent | b3008f9912924a19ad64903ead5f7606c39cd9a5 (diff) | |
download | ryu-android12-d1-s1-release.tar.gz |
Snap for 7325096 from b3008f9912924a19ad64903ead5f7606c39cd9a5 to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I8a5a69f74b839c276cafb9de0056244c9802f429
-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", -+ ], - } |