diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2020-12-23 20:13:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-23 20:13:10 +0000 |
| commit | b9cb5b0e94a74d2a1958f3411052c6a060c24c81 (patch) | |
| tree | 5cab2a24da1c140f31d6e9d61fae9bc4631bb7da | |
| parent | 6e2fedce249316c3a619887693878876f660c8d3 (diff) | |
| parent | ea2ddcbf4341a0caa4cbf16a0765fa5e05a944dd (diff) | |
| download | tinyvec-b9cb5b0e94a74d2a1958f3411052c6a060c24c81.tar.gz | |
Allow using tinyvec from DnsResolver am: ea2ddcbf43
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tinyvec/+/1535149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I777a329af538bea6a6de686b2510e93e5d1e4839
| -rw-r--r-- | Android.bp | 5 | ||||
| -rw-r--r-- | TEST_MAPPING | 19 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 21 insertions, 19 deletions
@@ -14,6 +14,11 @@ rust_library { rustlibs: [ "libtinyvec_macros", ], + apex_available: [ + "//apex_available:platform", + "com.android.resolv", + ], + min_sdk_version: "29", } // dependent_library ["feature_list"] diff --git a/TEST_MAPPING b/TEST_MAPPING deleted file mode 100644 index fb559f1..0000000 --- a/TEST_MAPPING +++ /dev/null @@ -1,19 +0,0 @@ -// Generated by cargo2android.py for tests in Android.bp -{ - "presubmit": [ - { - "host": true, - "name": "tinyvec_host_test_src_lib" - }, - { - "name": "tinyvec_device_test_src_lib" - }, - { - "host": true, - "name": "tinyvec_host_test_tests_arrayvec" - }, - { - "name": "tinyvec_device_test_tests_arrayvec" - } - ] -} diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..7261f1c --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,16 @@ +diff --git a/Android.bp b/Android.bp +index bfe5e04..e2a16fd 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -14,6 +14,11 @@ rust_library { + rustlibs: [ + "libtinyvec_macros", + ], ++ apex_available: [ ++ "//apex_available:platform", ++ "com.android.resolv", ++ ], ++ min_sdk_version: "29", + } + + // dependent_library ["feature_list"] |