cmsdk: Move sdk classes under new sdk directory.
TICKET: CYNGNOS-2299 Change-Id: Ia6c6a1ee901f4f94446c379cbceabfdfced651ef
This commit is contained in:
Adnan Begovic
parent
1ee5f204cc
commit
5f6c9f40c7
44
Android.mk
44
Android.mk
@ -30,8 +30,8 @@ cm_stub_packages := cyanogenmod.alarmclock:cyanogenmod.app:cyanogenmod.content:c
|
|||||||
# ============================================================
|
# ============================================================
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
|
|
||||||
cyanogenmod_src := src/java/cyanogenmod
|
cyanogenmod_sdk_src := sdk/src/java/cyanogenmod
|
||||||
cyanogenmod_internal_src := src/java/org/cyanogenmod/internal
|
cyanogenmod_sdk_internal_src := sdk/src/java/org/cyanogenmod/internal
|
||||||
library_src := cm/lib/main/java
|
library_src := cm/lib/main/java
|
||||||
|
|
||||||
LOCAL_MODULE := org.cyanogenmod.platform
|
LOCAL_MODULE := org.cyanogenmod.platform
|
||||||
@ -42,8 +42,8 @@ LOCAL_JAVA_LIBRARIES := \
|
|||||||
org.cyanogenmod.hardware
|
org.cyanogenmod.hardware
|
||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(call all-java-files-under, $(cyanogenmod_src)) \
|
$(call all-java-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-java-files-under, $(cyanogenmod_internal_src)) \
|
$(call all-java-files-under, $(cyanogenmod_sdk_internal_src)) \
|
||||||
$(call all-java-files-under, $(library_src))
|
$(call all-java-files-under, $(library_src))
|
||||||
|
|
||||||
## READ ME: ########################################################
|
## READ ME: ########################################################
|
||||||
@ -57,8 +57,8 @@ LOCAL_SRC_FILES := \
|
|||||||
##
|
##
|
||||||
## READ ME: ########################################################
|
## READ ME: ########################################################
|
||||||
LOCAL_SRC_FILES += \
|
LOCAL_SRC_FILES += \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_src)) \
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
|
||||||
|
|
||||||
cmplat_LOCAL_INTERMEDIATE_SOURCES := \
|
cmplat_LOCAL_INTERMEDIATE_SOURCES := \
|
||||||
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
||||||
@ -69,7 +69,7 @@ LOCAL_INTERMEDIATE_SOURCES := \
|
|||||||
$(cmplat_LOCAL_INTERMEDIATE_SOURCES)
|
$(cmplat_LOCAL_INTERMEDIATE_SOURCES)
|
||||||
|
|
||||||
# Include aidl files from cyanogenmod.app namespace as well as internal src aidl files
|
# Include aidl files from cyanogenmod.app namespace as well as internal src aidl files
|
||||||
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
|
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
|
||||||
|
|
||||||
include $(BUILD_JAVA_LIBRARY)
|
include $(BUILD_JAVA_LIBRARY)
|
||||||
cm_framework_module := $(LOCAL_INSTALLED_MODULE)
|
cm_framework_module := $(LOCAL_INSTALLED_MODULE)
|
||||||
@ -109,12 +109,12 @@ LOCAL_MODULE_TAGS := optional
|
|||||||
LOCAL_REQUIRED_MODULES := services
|
LOCAL_REQUIRED_MODULES := services
|
||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(call all-java-files-under, $(cyanogenmod_src)) \
|
$(call all-java-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_src)) \
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
|
||||||
|
|
||||||
# Included aidl files from cyanogenmod.app namespace
|
# Included aidl files from cyanogenmod.app namespace
|
||||||
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
|
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
|
||||||
|
|
||||||
cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
|
cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
|
||||||
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
||||||
@ -143,12 +143,12 @@ LOCAL_REQUIRED_MODULES := services
|
|||||||
LOCAL_JACK_ENABLED := disabled
|
LOCAL_JACK_ENABLED := disabled
|
||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(call all-java-files-under, $(cyanogenmod_src)) \
|
$(call all-java-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_src)) \
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
|
||||||
|
|
||||||
# Included aidl files from cyanogenmod.app namespace
|
# Included aidl files from cyanogenmod.app namespace
|
||||||
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
|
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
|
||||||
|
|
||||||
cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
|
cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
|
||||||
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
||||||
@ -168,13 +168,13 @@ LOCAL_MODULE_TAGS := optional
|
|||||||
LOCAL_REQUIRED_MODULES := services
|
LOCAL_REQUIRED_MODULES := services
|
||||||
|
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(call all-java-files-under, $(cyanogenmod_src)) \
|
$(call all-java-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-java-files-under, $(cyanogenmod_internal_src)) \
|
$(call all-java-files-under, $(cyanogenmod_sdk_internal_src)) \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_src)) \
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-Iaidl-files-under, $(cyanogenmod_internal_src))
|
$(call all-Iaidl-files-under, $(cyanogenmod_sdk_internal_src))
|
||||||
|
|
||||||
# Included aidl files from cyanogenmod.app namespace
|
# Included aidl files from cyanogenmod.app namespace
|
||||||
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src/java
|
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/sdk/src/java
|
||||||
|
|
||||||
cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
|
cmsdk_LOCAL_INTERMEDIATE_SOURCES := \
|
||||||
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
$(cm_platform_res)/cyanogenmod/platform/R.java \
|
||||||
@ -192,8 +192,8 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
|
|||||||
# ===========================================================
|
# ===========================================================
|
||||||
# Common Droiddoc vars
|
# Common Droiddoc vars
|
||||||
cmplat_docs_src_files := \
|
cmplat_docs_src_files := \
|
||||||
$(call all-java-files-under, $(cyanogenmod_src)) \
|
$(call all-java-files-under, $(cyanogenmod_sdk_src)) \
|
||||||
$(call all-html-files-under, $(cyanogenmod_src))
|
$(call all-html-files-under, $(cyanogenmod_sdk_src))
|
||||||
|
|
||||||
cmplat_docs_java_libraries := \
|
cmplat_docs_java_libraries := \
|
||||||
org.cyanogenmod.platform.sdk
|
org.cyanogenmod.platform.sdk
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user