diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-11-12 04:09:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-12 04:09:37 +0000 |
| commit | ddbde1f91e1db86c9b741c4d339d0685f699526e (patch) | |
| tree | c306363db73020dfb8e99fdb918c0a4c9169128a /Android.mk | |
| parent | 2b52d2a3cdcb0ac00d87d2c2cbd1d6b750ea036d (diff) | |
| parent | aceaed335f7beb25c340b14a8960a60337dadd8d (diff) | |
Merge changes I63e93080,Iff15e216
* changes:
Renamed string.xml to strings.xml to match Android convention
Add UiThreadExecutor
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index e9841d9dc..3c0b34c13 100644 --- a/Android.mk +++ b/Android.mk @@ -189,6 +189,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 \ @@ -293,6 +294,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) |