diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 09:34:28 -0700 |
---|---|---|
committer | Joel Galenson <jgalenson@google.com> | 2021-04-28 09:34:28 -0700 |
commit | b7aefdc0505efdf3b85db2fd3d4ad93e638ee09b (patch) | |
tree | ba149378c00d33edf2b1f48ebf6763aeb08bc733 | |
parent | 3b19cdc4c81ebc7f7130a56e7e103a45de75dd8e (diff) | |
download | unicode-bidi-b7aefdc0505efdf3b85db2fd3d4ad93e638ee09b.tar.gz |
Generate apex_available from c2a instead of a patchandroid-s-beta-2android-s-beta-1
Test: Run c2a
Test: Build
Change-Id: I408c0a063519294155442996bbe1f0c872ca5d48
-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 { |