diff options
| author | Roman Birg <roman@cyngn.com> | 2016-03-22 14:21:05 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-04-12 15:27:07 -0700 |
| commit | 620b1eb9084c2ea1d15ab20946f4c391588135c2 (patch) | |
| tree | b3411fd2bdd188b97c5164242052ae03d6138abf /Android.mk | |
| parent | 8a35e126a784d18d8d44c56d94f95b83fee79474 (diff) | |
| download | vendor_cmsdk-620b1eb9084c2ea1d15ab20946f4c391588135c2.zip vendor_cmsdk-620b1eb9084c2ea1d15ab20946f4c391588135c2.tar.gz vendor_cmsdk-620b1eb9084c2ea1d15ab20946f4c391588135c2.tar.bz2 | |
cmsdk: compile as aar
for common resources
TICKET: CYNGNOS-2305
Change-Id: Idc1872b5fa3884754b49b08d2f8381f18fba234d
Signed-off-by: Roman Birg <roman@cyngn.com>
Signed-off-by: Adnan Begovic <adnan@cyngn.com>
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 25 |
1 files changed, 9 insertions, 16 deletions
@@ -132,32 +132,25 @@ $(built_dex_intermediate): $(cm_framework_res_R_stamp) $(full_target): $(cm_framework_built) $(gen) include $(BUILD_STATIC_JAVA_LIBRARY) -# the sdk as a jar for publish, not built as part of full target +# the sdk as an aar for publish, not built as part of full target # DO NOT LINK AGAINST THIS IN BUILD # ============================================================ include $(CLEAR_VARS) -LOCAL_MODULE:= org.cyanogenmod.platform.sdk.jar -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := services +LOCAL_MODULE := org.cyanogenmod.platform.sdk.aar + LOCAL_JACK_ENABLED := disabled -LOCAL_SRC_FILES := \ - $(call all-java-files-under, $(cyanogenmod_sdk_src)) \ - $(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \ - $(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src)) +# just need to define this, $(TOP)/dummy should not exist +LOCAL_SRC_FILES := $(call all-java-files-under, dummy) -# Included aidl files from cyanogenmod.app namespace -LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java +LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res) +LOCAL_MANIFEST_FILE := sdk/AndroidManifest.xml -cmsdk_LOCAL_INTERMEDIATE_SOURCES := \ - $(cm_platform_res)/cyanogenmod/platform/R.java \ - $(cm_platform_res)/cyanogenmod/platform/Manifest.java - -LOCAL_INTERMEDIATE_SOURCES := \ - $(cmsdk_LOCAL_INTERMEDIATE_SOURCES) +LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk include $(BUILD_STATIC_JAVA_LIBRARY) +$(LOCAL_MODULE) : $(built_aar) # full target for use by platform apps # |