diff options
author | Joel Galenson <jgalenson@google.com> | 2021-04-28 22:34:17 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-28 22:34:17 +0000 |
commit | f49825e5b22f50e44870ff0785edb5f24bb04665 (patch) | |
tree | 031b9a1439a080028cca7242477294509db7c906 | |
parent | 652e32e1e3cad1b78180fc194c9f5abe184e4ec1 (diff) | |
parent | 7a1e406b1ff28f875e3c938871a0454c26002a90 (diff) | |
download | log-android12L-d2-s1-release.tar.gz |
Generate apex_available from c2a instead of a patch am: 32f926acec am: 01c6827421 am: fd5d2d7cc5 am: 7a1e406b1fandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/log/+/1688982
Change-Id: I8f1028db0de95738f7798261095adbefcc4e8741
-rw-r--r-- | Android.bp | 9 | ||||
-rw-r--r-- | cargo2android.json | 11 | ||||
-rw-r--r-- | patches/Android.bp.diff | 14 |
3 files changed, 16 insertions, 18 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --run --device --dependencies --features=std --patch=patches/Android.bp.diff. +// This file is generated by cargo2android.py --config cargo2android.json. // Do not modify this file as changes will be overridden on upgrade. package { @@ -40,14 +40,15 @@ license { rust_library { name: "liblog_rust", stem: "liblog", + // has rustc warnings host_supported: true, crate_name: "log", srcs: ["src/lib.rs"], edition: "2015", features: ["std"], - flags: [ - "--cfg atomic_cas", - "--cfg has_atomics", + cfgs: [ + "atomic_cas", + "has_atomics", ], rustlibs: [ "libcfg_if", diff --git a/cargo2android.json b/cargo2android.json new file mode 100644 index 0000000..723587f --- /dev/null +++ b/cargo2android.json @@ -0,0 +1,11 @@ +{ + "apex-available": [ + "//apex_available:platform", + "//apex_available:anyapex" + ], + "dependencies": true, + "device": true, + "features": "std", + "min-sdk-version": "29", + "run": true +}
\ No newline at end of file diff --git a/patches/Android.bp.diff b/patches/Android.bp.diff deleted file mode 100644 index f0de6f5..0000000 --- a/patches/Android.bp.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- Android.bp 2020-12-14 20:08:02.451621093 +0900 -+++ Android.bp.new 2020-12-14 20:05:44.460062409 +0900 -@@ -50,6 +50,11 @@ rust_library { - rustlibs: [ - "libcfg_if", - ], -+ apex_available: [ -+ "//apex_available:platform", -+ "//apex_available:anyapex", -+ ], -+ min_sdk_version: "29", - } - - // dependent_library ["feature_list"] |