diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2019-01-04 20:50:04 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-01-04 20:50:04 -0800 |
| commit | 2d235d2b69938ce2522183ec764edb1c7a350e11 (patch) | |
| tree | b3c2de4ecae596fbdeef7985bb322a3b354d85ad | |
| parent | 838167b1ce8d56034218fcd087a61d9b31a294ed (diff) | |
| parent | 9fad3db501bfdd83196556d6407dadfb6617f71f (diff) | |
| download | zxing-2d235d2b69938ce2522183ec764edb1c7a350e11.tar.gz | |
Merge "Convert zxing-core to Android.bp" am: bbf22e9b62
am: 9fad3db501
Change-Id: I3b21fe5dd75cc215b2de1a41bc36595b8ec20b1c
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | core/Android.bp | 6 | ||||
| -rw-r--r-- | core/Android.mk | 8 |
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) |