diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:29 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:06:29 +0000 |
commit | be2b8976bf44c907a88bba9808d08df0b6e6522b (patch) | |
tree | 8cab78e20c4344228f35b5aa8a47039926a4f317 | |
parent | 725dc4a203cabebe864899795607cdda37206a8c (diff) | |
parent | ad3f80dff5fdc35791a70b44c4c9225b338d82d6 (diff) | |
download | intrusive-collections-android12-s2-release.tar.gz |
Snap for 7325276 from ad3f80dff5fdc35791a70b44c4c9225b338d82d6 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: I0f305089292edef3c63ff5f7a736fa82c26e6125
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android.json | 10 | ||||
-rw-r--r-- | patches/Android.bp.patch | 20 |
3 files changed, 18 insertions, 16 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --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. // TODO(victorhsieh): Add --test. The test in the current version depends on an older rand crate // (pre 0.8) to compile due to several API changes. However, Android's rand is already newer. @@ -42,6 +43,7 @@ license { rust_library { name: "libintrusive_collections", + // has rustc warnings host_supported: true, crate_name: "intrusive_collections", srcs: ["src/lib.rs"], diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..623aa56 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,10 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "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 15d6516..f0c7569 100644 --- a/patches/Android.bp.patch +++ b/patches/Android.bp.patch @@ -2,21 +2,11 @@ diff --git a/Android.bp b/Android.bp index 9e3c084..d4334b6 100644 --- a/Android.bp +++ b/Android.bp -@@ -1,4 +1,6 @@ - // This file is generated by cargo2android.py --run --device --dependencies --patch=patches/Android.bp.patch. +@@ -1,5 +1,7 @@ + // This file is generated by cargo2android.py --config cargo2android.json. + // Do not modify this file as changes will be overridden on upgrade. +// TODO(victorhsieh): Add --test. The test in the current version depends on an older rand crate +// (pre 0.8) to compile due to several API changes. However, Android's rand is already newer. - rust_library { - name: "libintrusive_collections", -@@ -13,6 +15,10 @@ rust_library { - rustlibs: [ - "libmemoffset", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] + package { + default_applicable_licenses: [ |