diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:10:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:10:43 +0000 |
commit | 737f9c8000629b301e9e0aab85a317ef36e1c03f (patch) | |
tree | ba149378c00d33edf2b1f48ebf6763aeb08bc733 | |
parent | 98e2e626354f8c045110bdca70c22291cc2cd79e (diff) | |
parent | 0c1f704f00683fbb4df29e020e52e326ebd94420 (diff) | |
download | unicode-bidi-737f9c8000629b301e9e0aab85a317ef36e1c03f.tar.gz |
Generate apex_available from c2a instead of a patch am: b7aefdc050 am: a172325fac am: 0c1f704f00android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-dev
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/unicode-bidi/+/1688683
Change-Id: I986f0e47db893865817587efd2a280521a29ddd9
-rw-r--r-- | Android.bp | 10 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 16 |
3 files changed, 18 insertions, 19 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_unicode-bidi_license"], @@ -73,6 +74,9 @@ rust_defaults { rust_test_host { name: "unicode-bidi_host_test_src_lib", defaults: ["unicode-bidi_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -82,5 +86,5 @@ rust_test { // dependent_library ["feature_list"] // matches-0.1.8 -// serde-1.0.118 "default,std" -// serde_test-1.0.118 +// serde-1.0.125 "default,std" +// serde_test-1.0.125 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 c5ab732..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 83d60c0..66ceebd 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -11,6 +11,11 @@ rust_library { - rustlibs: [ - "libmatches", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ ], -+ min_sdk_version: "29", - } - - rust_defaults { |