diff options
| author | Adnan Begovic <adnan@cyngn.com> | 2015-07-18 17:12:21 -0700 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-07-20 11:51:24 -0700 |
| commit | 5ff5e10bf01ace13f38750e694340ab41db03b59 (patch) | |
| tree | 3044ebf2b903ccf0056fcff5174a9a67d4079fa8 /Android.mk | |
| parent | f12419a12c5c51d43a56c94ed38503660d34bbaa (diff) | |
| download | vendor_cmsdk-5ff5e10bf01ace13f38750e694340ab41db03b59.zip vendor_cmsdk-5ff5e10bf01ace13f38750e694340ab41db03b59.tar.gz vendor_cmsdk-5ff5e10bf01ace13f38750e694340ab41db03b59.tar.bz2 | |
cmsdk: Make sure we're not including source from internal package.
Change-Id: Ib0d5be9894e7181a3481969eea8bba848f7fdbb8
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 18 |
1 files changed, 11 insertions, 7 deletions
@@ -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 |