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

cmsdk: compile as aar

Browse Source 
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>
This commit is contained in:
Roman Birg 2016-03-22 14:21:05 -07:00 committed by Gerrit Code Review
parent 8a35e126a7
commit 620b1eb908
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Android.mk
View File

@ -132,32 +132,25 @@ $(built_dex_intermediate): $(cm_framework_res_R_stamp)
$(full_target): $(cm_framework_built) $(gen) $(full_target): $(cm_framework_built) $(gen)
include $(BUILD_STATIC_JAVA_LIBRARY) 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 # DO NOT LINK AGAINST THIS IN BUILD
# ============================================================ # ============================================================
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE:= org.cyanogenmod.platform.sdk.jar LOCAL_MODULE := org.cyanogenmod.platform.sdk.aar
LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := services
LOCAL_JACK_ENABLED := disabled LOCAL_JACK_ENABLED := disabled
LOCAL_SRC_FILES := \ # just need to define this, $(TOP)/dummy should not exist
$(call all-java-files-under, $(cyanogenmod_sdk_src)) \ LOCAL_SRC_FILES := $(call all-java-files-under, dummy)
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
# Included aidl files from cyanogenmod.app namespace LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, sdk/res/res)
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java LOCAL_MANIFEST_FILE := sdk/AndroidManifest.xml
cmsdk_LOCAL_INTERMEDIATE_SOURCES := \ LOCAL_STATIC_JAVA_LIBRARIES := org.cyanogenmod.platform.sdk
$(cm_platform_res)/cyanogenmod/platform/R.java \
$(cm_platform_res)/cyanogenmod/platform/Manifest.java
LOCAL_INTERMEDIATE_SOURCES := \
$(cmsdk_LOCAL_INTERMEDIATE_SOURCES)
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
$(LOCAL_MODULE) : $(built_aar)
# full target for use by platform apps # full target for use by platform apps
# #

21
sdk/AndroidManifest.xml Normal file
View File

@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright 2016, CyanogenMod Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-->
<manifest package="cyanogenmod.library">
</manifest>