Mark ab/6881855 as merged
Bug: 172690556
Change-Id: Ife4cd32d8c67dcccccb7399af3413da8cf0148c6
diff --git a/Android.bp b/Android.bp
index 82472e5..64302ac 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..dabccd6
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,8 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+ "presubmit": [
+ {
+ "name": "android_logger_device_test_src_lib"
+ }
+ ]
+}
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,
++ },
++ },
+ }
