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

cmsdk: Make sure we're not including source from internal package. 

Change-Id: Ib0d5be9894e7181a3481969eea8bba848f7fdbb8
This commit is contained in:
Adnan Begovic 2015-07-18 17:12:21 -07:00
parent f12419a12c
commit 5ff5e10bf0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Android.mk
View File

@ -27,7 +27,8 @@ cm_platform_res := APPS/org.cyanogenmod.platform-res_intermediates/src
# ============================================================
include $(CLEAR_VARS)
cyanogenmod_app_src := src/java/
cyanogenmod_src := src/java/cyanogenmod
cyanogenmod_internal_src := src/java/org/cyanogenmod/internal
library_src := cm/lib/main/java
LOCAL_MODULE := org.cyanogenmod.platform
@ -37,7 +38,8 @@ LOCAL_JAVA_LIBRARIES := \
services
LOCAL_SRC_FILES := \
$(call all-java-files-under, $(cyanogenmod_app_src)) \
$(call all-java-files-under, $(cyanogenmod_src)) \
$(call all-java-files-under, $(cyanogenmod_internal_src)) \
$(call all-java-files-under, $(library_src))
## READ ME: ########################################################
@ -51,7 +53,8 @@ LOCAL_SRC_FILES := \
##
## READ ME: ########################################################
LOCAL_SRC_FILES += \
$(call all-Iaidl-files-under, $(cyanogenmod_app_src))
$(call all-Iaidl-files-under, $(cyanogenmod_src)) \
$(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
cmplat_LOCAL_INTERMEDIATE_SOURCES := \
$(cm_platform_res)/cyanogenmod/platform/R.java \
@ -101,8 +104,9 @@ LOCAL_MODULE_TAGS := optional
LOCAL_REQUIRED_MODULES := services
LOCAL_SRC_FILES := \
$(call all-java-files-under, $(cyanogenmod_app_src)) \
$(call all-Iaidl-files-under, $(cyanogenmod_app_src))
$(call all-java-files-under, $(cyanogenmod_src)) \
$(call all-Iaidl-files-under, $(cyanogenmod_src)) \
$(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
# Included aidl files from cyanogenmod.app namespace
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
@ -113,8 +117,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
# ===========================================================
# Common Droiddoc vars
cmplat_docs_src_files := \
$(call all-java-files-under, $(cyanogenmod_app_src)) \
$(call all-html-files-under, $(cyanogenmod_app_src))
$(call all-java-files-under, $(cyanogenmod_src)) \
$(call all-html-files-under, $(cyanogenmod_src))
cmplat_docs_java_libraries := \
org.cyanogenmod.platform.sdk