diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:21 +0000 |
commit | 87992576fc6357287373e1b78290b684dd0ccb1b (patch) | |
tree | aa9c5fc45b7f8fd2b4b4925aa5a056befd82baad | |
parent | 9f27f1de083989e742aaa68697579120bb16c925 (diff) | |
parent | c39d4b91e58132ed424d0610e83f9c8fe0dc2a7b (diff) | |
download | proc-macro-nested-87992576fc6357287373e1b78290b684dd0ccb1b.tar.gz |
Generate apex_available from c2a instead of a patch am: 9d0e2785f6 am: a2a05c87b5 am: 0fc74f4358 am: c39d4b91e5android-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/proc-macro-nested/+/1689358
Change-Id: Ia0d836485ac51a071c5b584c36484e14ef45f291
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 16 insertions, 16 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device --tests --copy-out --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 { default_applicable_licenses: [ @@ -75,6 +76,9 @@ rust_defaults { rust_test_host { name: "proc-macro-nested_host_test_src_lib", defaults: ["proc-macro-nested_defaults"], + test_options: { + unit_test: true, + }, } rust_test { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..61885d6 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "copy-out": true, + "dependencies": true, + "device": true, + "run": true, + "tests": true +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index c80e275..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index b9fd260..103ae9b 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -16,6 +16,10 @@ rust_library { - ":copy_proc-macro-nested_build_out", - ], - edition: "2015", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - rust_defaults { |