diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-01 22:04:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-01 22:04:36 +0000 |
| commit | 9603682420714246cd328b619d95a68fde962515 (patch) | |
| tree | 49b6ff005e50a5361a721ac1a73e84d5e4526af4 | |
| parent | 7728b23a4c8c9fe64126df78c24d366aad6720cb (diff) | |
| parent | 7c49fca48b17de6880afcf42737e9d6e18e1d34a (diff) | |
| download | smallvec-9603682420714246cd328b619d95a68fde962515.tar.gz | |
Remove patch and use config file. am: 9aa887234f am: 7c49fca48b
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/smallvec/+/1723362
Change-Id: Ib17aeb9304ede24ac5543e3aa7e96a9e8bf2bc3d
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | cargo2android.json | 9 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 13 |
3 files changed, 10 insertions, 14 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --device --run --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. package { 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 5943f32..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index e99d7e0..12fdabd 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -42,4 +42,8 @@ rust_library { - crate_name: "smallvec", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } |