diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:47 +0000 |
| commit | 0204cb5c5d9c814cdd7c49530ce51c921cd89c8f (patch) | |
| tree | 944dd49676b5a1fbc7916dd2f43ce03118ec1bae | |
| parent | 85ef0c30465905cddeb4542c63fd6f2f83b60f71 (diff) | |
| parent | 910869d321e972487bf5d9501afc79f862489a8d (diff) | |
| download | serde-android12-qpr3-s2-release.tar.gz | |
Generate apex_available from c2a instead of a patch am: a907edecf9 am: cbe61bd42e am: 910869d321android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde/+/1689916
Change-Id: Iff973c7123dacddd9591d9e0243a504fbe75ed3b
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | cargo2android.json | 11 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 9 |
3 files changed, 14 insertions, 10 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --features=default,derive --patch=patches/Android.bp.patch. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -78,5 +78,5 @@ rust_library { // proc-macro2-1.0.26 "default,proc-macro" // quote-1.0.9 "default,proc-macro" // serde_derive-1.0.125 "default" -// syn-1.0.69 "clone-impls,default,derive,parsing,printing,proc-macro,quote" +// syn-1.0.71 "clone-impls,default,derive,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..4e40fcb --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "features": "default,derive", + "patch": "patches/Android.bp.patch", + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch index c124dc0..071947f 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,7 +2,7 @@ diff --git b/Android.bp a/Android.bp index 41d67cc..277296f 100644 --- b/Android.bp +++ a/Android.bp -@@ -64,10 +64,14 @@ +@@ -64,7 +64,7 @@ "range_inclusive", "serde_derive", "std_atomic", @@ -11,10 +11,3 @@ index 41d67cc..277296f 100644 "systemtime_checked_add", ], proc_macros: ["libserde_derive"], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |