diff options
author | Chih-Hung Hsieh <chh@google.com> | 2020-10-30 16:33:14 -0700 |
---|---|---|
committer | Chih-Hung Hsieh <chh@google.com> | 2020-10-30 17:13:05 -0700 |
commit | 27ce6de4e80fe614f6f828fb503c44f510cf611f (patch) | |
tree | 2d6bfb6e190e39ffd849e8863bb973c2f9206f80 | |
parent | 99daf7ab45e2f51e4d6d1b7b7c73646d1fc27a02 (diff) | |
download | android_log-sys-27ce6de4e80fe614f6f828fb503c44f510cf611f.tar.gz |
Use cargo2android.py with a patch file.
* No need to manually fix the .bp file after a version upgrade.
Bug: 172093078
Test: make and regenerate .bp
Change-Id: I24e11307a4897e00e2fa8030fe108f168e1f2abe
-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, ++ }, ++ }, + } |