diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:58 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:05:58 +0000 |
commit | d7f399ee651ddc06442981b97ad33cc0bf5f8fc8 (patch) | |
tree | aa9c5fc45b7f8fd2b4b4925aa5a056befd82baad | |
parent | aa5fc78ccf54cfcd21bf17dc48d28ed21f64c3a0 (diff) | |
parent | c39d4b91e58132ed424d0610e83f9c8fe0dc2a7b (diff) | |
download | proc-macro-nested-android12-d1-s2-release.tar.gz |
Snap for 7325096 from c39d4b91e58132ed424d0610e83f9c8fe0dc2a7b 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: Ice8036dc2009617647e8762d7f954ee9755df371
-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 { |