summaryrefslogtreecommitdiff
path: root/Android.mk
diff options
context:
space:
mode:
authorroldenburg <roldenburg@google.com>2018-02-22 23:25:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-22 23:25:20 +0000
commit26c4466796997d2af5140eea89331c2c5f7c1868 (patch)
tree5999cb62049453a685260d636bade06d591df5f8 /Android.mk
parentcc74d1489fc09097b7d4d3b4c75e782a8e6f04ec (diff)
parent4d2b2501924140f3d40a2453ccf8bbc94f578b4e (diff)
Merge "Show IMEI/MEID in hex, dec, and barcode when appropriate" am: 494552349a
am: 4d2b250192 Change-Id: Ibd89fbcc0dfb248dd974f76373c1243b79993987
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index c69a0903a..5957458d8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -111,6 +111,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
dialer-guava-target \
dialer-glide-target \
dialer-glide-annotation-target \
+ dialer-zxing-target \
jsr305 \
libbackup \
libphonenumber \
@@ -408,3 +409,14 @@ LOCAL_UNINSTALLABLE_MODULE := true
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-zxing-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../external/zxing/core/core.jar
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+