diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:01 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:01 +0000 |
commit | 6c8fb39344b6b9b9a58f10b5c997f59f8f745402 (patch) | |
tree | 944dd49676b5a1fbc7916dd2f43ce03118ec1bae | |
parent | 7041d72e71e7a03324420e28d2e084d63cfd42f3 (diff) | |
parent | 0204cb5c5d9c814cdd7c49530ce51c921cd89c8f (diff) | |
download | serde-android12-s4-release.tar.gz |
Snap for 7325276 from 0204cb5c5d9c814cdd7c49530ce51c921cd89c8f to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r60android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: Iac2f2919618a2a43cd62b4fd9a5e13ca27f78f3e
-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"] |