diff options
| author | Colin Cross <ccross@android.com> | 2018-07-24 14:45:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-24 14:45:13 -0700 |
| commit | f0668c48808bb99d1355f378f27aed0236f72274 (patch) | |
| tree | 40db8576835c6f6d2d50699215c631706a802bb4 | |
| parent | 2a20cb895df19ee0376201f230f9d88c8625968b (diff) | |
| parent | 458dd1cf44bb7c49c9ba247a208f89e3a479a688 (diff) | |
Merge "Re-enable proguard for Dialer" am: 2789b8de52 am: bba49f0286
am: 458dd1cf44
Change-Id: I0e7900d413ab33e9f6ad9d5665b1fa68b701dc20
| -rw-r--r-- | Android.mk | 57 |
1 files changed, 45 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk index 0710067b6..1b9735f88 100644 --- a/Android.mk +++ b/Android.mk @@ -104,6 +104,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ android-common \ android-support-dynamic-animation \ com.android.vcard \ + dialer-animal-sniffer-annotations-target \ dialer-commons-io-target \ dialer-dagger2-target \ dialer-disklrucache-target \ @@ -115,11 +116,14 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ dialer-grpc-okhttp-target \ dialer-grpc-protobuf-lite-target \ dialer-grpc-stub-target \ + dialer-j2objc-annotations-target \ dialer-javax-annotation-api-target \ dialer-javax-inject-target \ dialer-libshortcutbadger-target \ dialer-mime4j-core-target \ dialer-mime4j-dom-target \ + dialer-okhttp-target \ + dialer-okio-target \ dialer-error-prone-target \ dialer-guava-target \ dialer-glide-target \ @@ -160,22 +164,11 @@ LOCAL_ANNOTATION_PROCESSORS := \ LOCAL_ANNOTATION_PROCESSOR_CLASSES := \ com.google.auto.value.processor.AutoValueProcessor,dagger.internal.codegen.ComponentProcessor,com.bumptech.glide.annotation.compiler.GlideAnnotationProcessor,com.android.dialer.rootcomponentgenerator.RootComponentProcessor -# Begin Bug: 37077388 -LOCAL_DX_FLAGS := --multi-dex -LOCAL_JACK_FLAGS := --multi-dex native - -LOCAL_PROGUARD_ENABLED := disabled -ifdef LOCAL_JACK_ENABLED - - # Proguard includes -LOCAL_PROGUARD_FLAG_FILES := $(call all-named-files-under,proguard.*flags,$(BASE_DIR)) +LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(call all-named-files-under,proguard.*flags,$(BASE_DIR)) LOCAL_PROGUARD_ENABLED := custom LOCAL_PROGUARD_ENABLED += optimization -endif - -# End Bug: 37077388 LOCAL_SDK_VERSION := system_current LOCAL_MODULE_TAGS := optional @@ -434,6 +427,46 @@ include $(BUILD_PREBUILT) include $(CLEAR_VARS) +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE := dialer-okhttp-target +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/squareup/okhttp/okhttp/2.7.4/okhttp-2.7.4.jar +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE := dialer-okio-target +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/squareup/okio/okio/1.9.0/okio-1.9.0.jar +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE := dialer-j2objc-annotations-target +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := JAVA_LIBRARIES +LOCAL_MODULE := dialer-animal-sniffer-annotations-target +LOCAL_SDK_VERSION := current +LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) + LOCAL_MODULE := dialer-rootcomponentprocessor LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_IS_HOST_MODULE := true |