diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2020-11-03 05:50:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-03 05:50:04 +0000 |
| commit | d68a4dc7957e770c6e253503b3fd0c9b63e7195e (patch) | |
| tree | 2d6bfb6e190e39ffd849e8863bb973c2f9206f80 | |
| parent | 0cf9ed33fca5292ba532be6894dc2e7134682304 (diff) | |
| parent | 786a8eb175e2a9980baabdac59f0a3e224a40f20 (diff) | |
| download | android_log-sys-d68a4dc7957e770c6e253503b3fd0c9b63e7195e.tar.gz | |
Use cargo2android.py with a patch file. am: 27ce6de4e8 am: 0a29bc79d4 am: 786a8eb175
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/android_log-sys/+/1483937
Change-Id: I0f0f26b7e4547bac64443fd7f4a9574b9c6d4745
| -rw-r--r-- | Android.bp | 4 | ||||
| -rw-r--r-- | patches/Android.bp.patch | 13 |
2 files changed, 15 insertions, 2 deletions
@@ -1,11 +1,11 @@ -// This file is generated by cargo2android.py --run --dependencies --device --no-host. +// This file is generated by cargo2android.py --run --dependencies --device --patch=patches/Android.bp.patch. rust_library { name: "libandroid_log_sys", + host_supported: true, crate_name: "android_log_sys", srcs: ["src/lib.rs"], edition: "2015", - host_supported: true, target: { linux_glibc: { // liblog is not added as a dependency for linux_glibc target diff --git a/patches/Android.bp.patch b/patches/Android.bp.patch new file mode 100644 index 0000000..f00ea81 --- /dev/null +++ b/patches/Android.bp.patch @@ -0,0 +1,13 @@ +--- Android.bp.orig 2020-10-30 16:31:00.469140136 -0700 ++++ Android.bp 2020-10-30 16:31:43.436969421 -0700 +@@ -6,4 +6,10 @@ + 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, ++ }, ++ }, + } |