diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 21:19:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 21:19:49 +0000 |
commit | 0dc6e78761738bf47086b09636a6284a0dfe6699 (patch) | |
tree | 9bd4cbdf57149234a5c246cc61ad91d2ef7a4ff2 | |
parent | b2d73fc34df602385e857f27e36a009c3c4c3e9b (diff) | |
parent | 34cbfaba65d741ca66c0b6614843ed1d39740a39 (diff) | |
download | env_logger-0dc6e78761738bf47086b09636a6284a0dfe6699.tar.gz |
Generate apex_available from c2a instead of a patch am: 34cbfaba65
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/env_logger/+/1688624
Change-Id: I2b4edc320ab43fa56c1dc2b1322fd0ed0afbd8f0
-rw-r--r-- | Android.bp | 7 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.patch | 15 |
3 files changed, 14 insertions, 19 deletions
@@ -1,4 +1,5 @@ -// This file is generated by cargo2android.py --run --dependencies --device --features= --tests. +// 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_env_logger_license"], @@ -67,9 +68,7 @@ rust_defaults { test_suites: ["general-tests"], auto_gen_config: true, edition: "2018", - flags: [ - "--cfg test", - ], + cfgs: ["test"], rustlibs: [ "libenv_logger", "liblog_rust", diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..806cd85 --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "com.android.virt" + ], + "dependencies": true, + "device": true, + "features": "", + "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 524b483..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/Android.bp b/Android.bp -index a1abfe9..0dadb42 100644 ---- a/Android.bp -+++ b/Android.bp -@@ -109,6 +109,10 @@ rust_library { - rustlibs: [ - "liblog_rust", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "com.android.virt", -+ ], - } - - // dependent_library ["feature_list"] |