diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:32:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:32:47 +0000 |
| commit | 1a2dbff337105d3289f8413998a6d1c00e705d29 (patch) | |
| tree | 193166e7be6ae68eaf4964aff2e3a350add120a5 | |
| parent | 9882ad9c9a20910ac833c25f968287fb586bf899 (diff) | |
| parent | 288c2c63c01613336f6f6573a03b5899f51cf299 (diff) | |
| download | url-1a2dbff337105d3289f8413998a6d1c00e705d29.tar.gz | |
Generate apex_available from c2a instead of a patch am: 6ba66615eb am: 62f5f6ed35 am: 82a301e9f3 am: 288c2c63c0
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/url/+/1690050
Change-Id: I49d8fd830e37f291e2415ac8dae8d6c455dafe9f
| -rw-r--r-- | Android.bp | 13 | ||||
| -rw-r--r-- | cargo2android.json | 11 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 18 insertions, 22 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: ["external_rust_crates_url_license"], @@ -135,14 +136,14 @@ rust_test { // dependent_library ["feature_list"] // bencher-0.1.5 // form_urlencoded-1.0.1 -// idna-0.2.2 +// idna-0.2.3 // itoa-0.4.7 // matches-0.1.8 // percent-encoding-2.1.0 // ryu-1.0.5 -// serde-1.0.123 "std" -// serde_json-1.0.62 "default,std" -// tinyvec-1.1.1 "alloc,default,tinyvec_macros" +// serde-1.0.125 "std" +// serde_json-1.0.64 "default,std" +// tinyvec-1.2.0 "alloc,default,tinyvec_macros" // tinyvec_macros-0.1.0 -// unicode-bidi-0.3.4 "default" +// unicode-bidi-0.3.5 "default" // unicode-normalization-0.1.17 "default,std" 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 3b90dc3..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index f3305e8..75e8805 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -12,6 +12,11 @@ rust_library { - "libmatches", - "libpercent_encoding", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { |