From 62604cf5404e31cd4fc32b9d79c300505629eb0f Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Wed, 13 Apr 2016 09:51:21 -0700 Subject: [PATCH] cmsdk: Exclude compiled 'cyanogenmod/library' java package. Since aar's contain the raw resource to be compiled into the consumer package, having the compiled java from the resources inside of the java archive can lead to multiple instances of the class in the target package during compilation. Avoid that scenario by excluding the compile 'cyanogenmod/library' package from the final aar. TICKET: CYNGNOS-2305 Change-Id: I3b40205f4c2173ecd059e034312ed18dc9c6de34 --- Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Android.mk b/Android.mk index aa64ce6..e8bd59e 100644 --- a/Android.mk +++ b/Android.mk @@ -147,6 +147,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, dummy) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res) LOCAL_MANIFEST_FILE := sdk/AndroidManifest.xml +cmsdk_exclude_files := 'cyanogenmod/library' +LOCAL_JAR_EXCLUDE_PACKAGES := $(cmsdk_exclude_files) +LOCAL_JAR_EXCLUDE_FILES := none + LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk include $(BUILD_STATIC_JAVA_LIBRARY)