diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:19:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:19:52 +0000 |
commit | 17ed030c3a9f5ba78a4615d63662d66f3b09c363 (patch) | |
tree | 4297b239b54575afe47bb731eb0e534b35425af6 | |
parent | 66b9946ad46216cfd8a22ebec4ec21763bff3944 (diff) | |
parent | 95ac981491564dcc71b61894c90258d4dee1ea7b (diff) | |
download | form_urlencoded-17ed030c3a9f5ba78a4615d63662d66f3b09c363.tar.gz |
Generate apex_available from c2a instead of a patch am: 95ac981491android-s-beta-4android-s-beta-3android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/form_urlencoded/+/1688363
Change-Id: I13319aa900f3e18a97c0a1965f4ba06bd1cabaa3
-rw-r--r-- | Android.bp | 3 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 13 insertions, 17 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --device --dependencies --tests --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: [ diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..911c36f --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv" + ], + "dependencies": true, + "device": true, + "min-sdk-version": "29", + "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 177e109..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 7dad1bf..ccb680f 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -10,6 +10,11 @@ rust_library { - "libmatches", - "libpercent_encoding", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - // dependent_library ["feature_list"] |