ADHOC/replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsdk: Exclude compiled 'cyanogenmod/library' java package.

Browse Source 
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
This commit is contained in:
Adnan Begovic 2016-04-13 09:51:21 -07:00 committed by Gerrit Code Review
parent ad5e5d019f
commit 62604cf540
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Android.mk
View File

@ -147,6 +147,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, dummy)
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res)
LOCAL_MANIFEST_FILE := sdk/AndroidManifest.xml 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 LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)