diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:54 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:54 +0000 |
commit | 81ea5ff3e28c9e11bef4776c7a1536d3220e1fa9 (patch) | |
tree | 468b171d04d12d79930f58d6efc7ec3a45854589 | |
parent | 82be199e2628f0b7bc9af24c1786c00f5381fa22 (diff) | |
parent | 4eafa0cc0e589d8dd142ef7d2c30718b0f9c0e5b (diff) | |
download | pin-project-android-12.0.0_r4.tar.gz |
Snap for 7325096 from 4eafa0cc0e589d8dd142ef7d2c30718b0f9c0e5b 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: I5fc7a662cd304cb5935929073c156a76023234b6
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android.json | 9 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 11 insertions, 17 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --dependencies --device --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 { @@ -54,5 +54,5 @@ rust_library { // pin-project-internal-1.0.6 // proc-macro2-1.0.26 "default,proc-macro" // quote-1.0.9 "default,proc-macro" -// syn-1.0.68 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" +// syn-1.0.71 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut" // unicode-xid-0.2.1 "default" 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 e0adcd4..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 1ed91d5..16df3fc 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -7,6 +7,10 @@ rust_library { - srcs: ["src/lib.rs"], - edition: "2018", - proc_macros: ["libpin_project_internal"], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |