Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23b83ca2 authored by Colin Cross's avatar Colin Cross
Browse files

Re-enable proguard for Dialer 

Now that we use d8 instead of dx we no longer get the
SimException errors.  Instead we get some warnings:
In out/target/common/obj/APPS/Dialer_intermediates/classes-proguard.jar:com/android/incallui/answer/impl/affordance/SwipeButtonHelper.class:
  Methods with invalid locals information:
  boolean com.android.incallui.answer.impl.affordance.SwipeButtonHelper.onTouchEvent(android.view.MotionEvent)

Re-enabling proguard requires adding some missing transitive
dependencies and disabling warnings for some classes that
are not in Android.

Bug: 37077388
Test: m Dialer
Change-Id: I83e82d6665f02ec22c1d4ca47dc7ccbc564b8c8d
parent 4d6e1080

Android.mk

+45 −12
Original line number Diff line number Diff line
@@ -99,6 +99,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 \
@@ -110,11 +111,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 \
@@ -155,22 +159,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
@@ -429,6 +422,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