diff options
| author | twyen <twyen@google.com> | 2018-02-10 02:35:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-02-10 02:35:31 +0000 |
| commit | b4d2497244786a8886158228952cccaa5b6d6786 (patch) | |
| tree | 79d3f583ca14193735e5e982b37f7c04a44d946b /Android.mk | |
| parent | 24f41efed9157ca946b4dd7552b52e3597440897 (diff) | |
| parent | 27857a45da94833d3b5f0227fed43cbad1fbc6f2 (diff) | |
Merge changes Ic71e99ed,Ic7dec5ee,If801b452,Iecb99c65,I8db7e08b, ... am: d426457575 am: cdd527e0b6
am: 27857a45da
Change-Id: I63fd81130808bfa228a4e7e5b45bafd68aa46d3f
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index be49a710d..7f165f279 100644 --- a/Android.mk +++ b/Android.mk @@ -114,6 +114,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dialer-mime4j-dom-target \ dialer-error-prone-target \ dialer-guava-target \ + dialer-glide-target \ + dialer-glide-annotation-target \ jsr305 \ libbackup \ libphonenumber \ @@ -135,11 +137,12 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_ANNOTATION_PROCESSORS := \ dialer-auto-value \ + dialer-javapoet \ dialer-dagger2 \ dialer-dagger2-compiler \ dialer-dagger2-producers \ - dialer-glide-compiler \ dialer-glide-annotation \ + dialer-glide-compiler \ dialer-guava \ dialer-javax-annotation-api \ dialer-javax-inject \ @@ -202,7 +205,8 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \ dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3.jar \ dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/23.0/guava-23.0.jar \ dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar \ - dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar + dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar \ + dialer-javapoet:../../../prebuilts/tools/common/m2/repository/com/squareup/javapoet/1.8.0/javapoet-1.8.0.jar \ include $(BUILD_HOST_PREBUILT) @@ -271,6 +275,16 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE := dialer-glide-annotation-target +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := ../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_MODULE := dialer-javax-annotation-api-target LOCAL_SDK_VERSION := current LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar |