diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2016-04-13 09:51:21 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-14 10:51:47 -0700 |
| commit | 62604cf5404e31cd4fc32b9d79c300505629eb0f (patch) | |
| tree | 9df21718cc6dd398292c3d88b2b9a62c306f5924 | |
| parent | ad5e5d019f9cd3e988751646c2ae2633d1dc27e2 (diff) | |
| download | vendor_cmsdk-62604cf5404e31cd4fc32b9d79c300505629eb0f.zip vendor_cmsdk-62604cf5404e31cd4fc32b9d79c300505629eb0f.tar.gz vendor_cmsdk-62604cf5404e31cd4fc32b9d79c300505629eb0f.tar.bz2 | |
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
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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) |