summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorroldenburg <roldenburg@google.com>2017-11-12 04:19:00 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-11-12 04:19:00 +0000
commitcc24192be73fbc7f4fdc590a9b4b18e43bf79902 (patch)
tree7289982547c279b914e7cf3248b6cdab67199c99 /Android.mk
parentc3fab28d848922024940ae50a90a9698d1ec823e (diff)
parent09378240c2a3b7a95f61366b1fcbcc4add392d44 (diff)
downloadandroid_packages_apps_Dialer-cc24192be73fbc7f4fdc590a9b4b18e43bf79902.tar.gz
android_packages_apps_Dialer-cc24192be73fbc7f4fdc590a9b4b18e43bf79902.tar.bz2
android_packages_apps_Dialer-cc24192be73fbc7f4fdc590a9b4b18e43bf79902.zip
Merge changes I63e93080,Iff15e216 am: ddbde1f91e am: 05c19cf312
am: 09378240c2 Change-Id: I7b893aea93bbea4d206e2c090c7a4a29cb095407
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk11
1 files changed, 11 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 105b791df..d24abbf44 100644
--- a/Android.mk
+++ b/Android.mk
@@ -194,6 +194,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
dialer-libshortcutbadger-target \
dialer-mime4j-core-target \
dialer-mime4j-dom-target \
+ dialer-error-prone-target \
dialer-guava-target \
jsr305 \
libbackup \
@@ -298,6 +299,16 @@ include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
+LOCAL_MODULE := dialer-error-prone-target
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18$(COMMON_JAVA_PACKAGE_SUFFIX)
+LOCAL_UNINSTALLABLE_MODULE := true
+
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_MODULE := dialer-dagger2-target
LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX)