summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorroldenburg <roldenburg@google.com>2018-02-22 23:37:42 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-02-22 23:37:42 +0000
commita86d75663a3f95e56ddff9ae232c71abf7fd7702 (patch)
tree7137845d46c352956c7b9f802e0afc5a053f8541 /Android.mk
parent02b68180bdd37434fa8c0c7f8cb052ae6bd3ecad (diff)
parent26c4466796997d2af5140eea89331c2c5f7c1868 (diff)
downloadandroid_packages_apps_Dialer-a86d75663a3f95e56ddff9ae232c71abf7fd7702.tar.gz
android_packages_apps_Dialer-a86d75663a3f95e56ddff9ae232c71abf7fd7702.tar.bz2
android_packages_apps_Dialer-a86d75663a3f95e56ddff9ae232c71abf7fd7702.zip
Merge "Show IMEI/MEID in hex, dec, and barcode when appropriate" am: 494552349a am: 4d2b250192
am: 26c4466796 Change-Id: I756e5b2ec75667aedf4fb021b706ac1b1dcc6d36
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 7f165f279..4059ca08f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -116,6 +116,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
dialer-guava-target \
dialer-glide-target \
dialer-glide-annotation-target \
+ dialer-zxing-target \
jsr305 \
libbackup \
libphonenumber \
@@ -413,3 +414,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)
+