aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2019-01-04 14:50:31 -0800
committerDan Willemsen <dwillemsen@google.com>2019-01-04 14:50:57 -0800
commit5ddd908e4ef5f06705a2025eb6233b47fcbae7ce (patch)
treeb3c2de4ecae596fbdeef7985bb322a3b354d85ad
parentbcf363796549dc11dc9c331fcb7c48e48e86f7ce (diff)
downloadzxing-5ddd908e4ef5f06705a2025eb6233b47fcbae7ce.tar.gz
Convert zxing-core to Android.bp
See build/soong/README.md for more information. Fixes: 122332351 Test: treehugger Change-Id: I02ca52692662691e805add2da876b11ea3302c2d
-rw-r--r--Android.mk3
-rw-r--r--core/Android.bp6
-rw-r--r--core/Android.mk8
3 files changed, 6 insertions, 11 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 5668d0520..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/core/Android.bp b/core/Android.bp
new file mode 100644
index 000000000..ab09c6d72
--- /dev/null
+++ b/core/Android.bp
@@ -0,0 +1,6 @@
+java_import {
+ name: "zxing-core-1.7",
+ host_supported: true,
+ installable: false,
+ jars: ["core.jar"],
+}
diff --git a/core/Android.mk b/core/Android.mk
deleted file mode 100644
index 8eb6e0c20..000000000
--- a/core/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := zxing-core-1.7:core.jar
-include $(BUILD_MULTI_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := zxing-core-1.7:core.jar
-include $(BUILD_HOST_PREBUILT)