diff options
| author | Joel Galenson <jgalenson@google.com> | 2021-06-21 15:50:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-21 15:50:48 +0000 |
| commit | fa98e513d7c287550acabd51967da5a891da9cdf (patch) | |
| tree | e1c05f9e09f6f4d727f8a235baf11625e1ad5e04 | |
| parent | 993f810b088f7ad4a5ce9cb1c3926a1cab2c35da (diff) | |
| parent | ffa228e8587078971b138e9be059605cedc163b3 (diff) | |
| download | android_log-sys-fa98e513d7c287550acabd51967da5a891da9cdf.tar.gz | |
Merge "Remove patch." am: ffa228e858
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/1733439
Change-Id: Ieed0bda9b0aa8ad822606d508a91af4344f64d3f
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | cargo2android.json | 2 | ||||
| -rw-r--r-- | cargo2android_glibc.bp | 6 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 15 |
4 files changed, 13 insertions, 22 deletions
@@ -45,12 +45,6 @@ rust_library { crate_name: "android_log_sys", srcs: ["src/lib.rs"], edition: "2015", - target: { - linux_glibc: { - // liblog is not added as a dependency for linux_glibc target - enabled: false, - }, - }, apex_available: [ "//apex_available:platform", "com.android.compos", @@ -58,4 +52,10 @@ rust_library { "com.android.virt", ], min_sdk_version: "29", + target: { + linux_glibc: { + // liblog is not added as a dependency for linux_glibc target + enabled: false, + }, + }, } diff --git a/cargo2android.json b/cargo2android.json index 34bf360..1eff91b 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -1,4 +1,5 @@ { + "add-module-block": "cargo2android_glibc.bp", "apex-available": [ "//apex_available:platform", "com.android.compos", @@ -8,6 +9,5 @@ "min_sdk_version": "29", "dependencies": true, "device": true, - "patch": "patches/Android.bp.patch", "run": true }
\ No newline at end of file diff --git a/cargo2android_glibc.bp b/cargo2android_glibc.bp new file mode 100644 index 0000000..f4d25cf --- /dev/null +++ b/cargo2android_glibc.bp @@ -0,0 +1,6 @@ +target: { + linux_glibc: { + // liblog is not added as a dependency for linux_glibc target + enabled: false, + }, +}
\ No newline at end of file diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch deleted file mode 100644 index 988834c..0000000 --- a/patches/Android.bp.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Android.bp -+++ b/Android.bp -@@ -45,6 +45,12 @@ rust_library { - crate_name: "android_log_sys", - srcs: ["src/lib.rs"], - edition: "2015", -+ target: { -+ linux_glibc: { -+ // liblog is not added as a dependency for linux_glibc target -+ enabled: false, -+ }, -+ }, - apex_available: [ - "//apex_available:platform", - "com.android.resolv", |