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

Commit 62c70f5f authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Fix proguard failure when using javac am: 084ef10d 

am: f62a9d75

Change-Id: I9cc4269d87a884d0e66adc8ec78d71f06eefa03d
parents af2b7292 f62a9d75

Android.mk

+4 −2
Original line number Original line Diff line number Diff line
@@ -4,7 +4,8 @@ include $(CLEAR_VARS) 




LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional





LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13-prebuilt

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4

LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13

LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2

LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2

LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit

LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit

LOCAL_STATIC_JAVA_LIBRARIES += mp4parser

LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
@@ -14,7 +15,8 @@ LOCAL_SRC_FILES := \ 
    $(call all-renderscript-files-under, src)

    $(call all-renderscript-files-under, src)

LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)

LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)





LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res

LOCAL_RESOURCE_DIR += $(LOCAL_PATH)/res \

    $(LOCAL_PATH)/../../../frameworks/support/compat/res





LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS := --auto-add-overlay

LOCAL_AAPT_FLAGS += --extra-packages android.support.compat

LOCAL_AAPT_FLAGS += --extra-packages android.support.compat