diff options
author | Andrew Walbran <qwandor@google.com> | 2023-10-24 10:47:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-24 10:47:43 +0000 |
commit | 21faa2b883944a29cad579cacc70fd30227e7ce5 (patch) | |
tree | 0839d88724ae2b2dfceea8c4d240f12e9e8d596f | |
parent | 1193439e064547f550228e40f0d98895553cf399 (diff) | |
parent | 67ca4533574611b37a1f3c85a0f5abe6f9b62a65 (diff) | |
download | android_log-sys-21faa2b883944a29cad579cacc70fd30227e7ce5.tar.gz |
Migrate to cargo_embargo. am: 1c0d938b85 am: 67ca453357
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/2796541
Change-Id: I132cdaa3af199eefb36be5d31d7cb2cf96c56d9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 6 | ||||
-rw-r--r-- | cargo2android.json | 12 | ||||
-rw-r--r-- | cargo_embargo.json | 9 |
3 files changed, 12 insertions, 15 deletions
@@ -1,4 +1,4 @@ -// This file is generated by cargo2android.py --config cargo2android.json. +// This file is generated by cargo_embargo. // Do not modify this file as changes will be overridden on upgrade. package { @@ -63,6 +63,6 @@ rust_library { // liblog is not added as a dependency for linux_musl target enabled: false, }, - } - , + }, + } diff --git a/cargo2android.json b/cargo2android.json deleted file mode 100644 index 17c8006..0000000 --- a/cargo2android.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "add-module-block": "cargo2android_glibc.bp", - "apex-available": [ - "//apex_available:platform", - "//apex_available:anyapex" - ], - "dependencies": true, - "device": true, - "min-sdk-version": "29", - "run": true, - "vendor-available": true -} diff --git a/cargo_embargo.json b/cargo_embargo.json new file mode 100644 index 0000000..b0b55c1 --- /dev/null +++ b/cargo_embargo.json @@ -0,0 +1,9 @@ +{ + "min_sdk_version": "29", + "package": { + "android_log-sys": { + "add_module_block": "cargo2android_glibc.bp" + } + }, + "run_cargo": false +} |