diff options
| -rw-r--r-- | Android.bp | 9 | ||||
| -rw-r--r-- | cargo2android.json | 12 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 20 insertions, 16 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --tests --device --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_cfg-if_license"], @@ -48,6 +49,9 @@ rust_defaults { rust_test_host { name: "cfg-if_host_test_src_lib", defaults: ["cfg-if_defaults"], + test_options: { + unit_test: true, + }, } rust_test { @@ -70,6 +74,9 @@ rust_defaults { rust_test_host { name: "cfg-if_host_test_tests_xcrate", defaults: ["cfg-if_defaults_xcrate"], + test_options: { + unit_test: true, + }, } rust_test { diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..5412b5b --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,12 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.resolv", + "com.android.virt" + ], + "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 083dd17..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index 78c65e6..82b7964 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -47,4 +47,10 @@ rust_library { - crate_name: "cfg_if", - srcs: ["src/lib.rs"], - edition: "2018", -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.resolv", -+ "com.android.virt", -+ ], -+ min_sdk_version: "29", - } |