diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/core/apicheck.mk | 20 | ||||
| -rw-r--r-- | build/core/config.mk | 18 |
2 files changed, 28 insertions, 10 deletions
diff --git a/build/core/apicheck.mk b/build/core/apicheck.mk index 2800fa8..aa755f7 100644 --- a/build/core/apicheck.mk +++ b/build/core/apicheck.mk @@ -47,7 +47,7 @@ $(eval $(call check-api, \ checkpublicapi-cm-last, \ $(CM_SRC_API_DIR)/$(cm_last_released_sdk_version).txt, \ $(INTERNAL_CM_PLATFORM_API_FILE), \ - vendor/cmsdk/api/cm_removed.txt, \ + $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE), \ $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE), \ cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \ check-cm-public-api, \ @@ -59,9 +59,9 @@ $(eval $(call check-api, \ # SDK version. $(eval $(call check-api, \ checkpublicapi-cm-current, \ - vendor/cmsdk/api/cm_current.txt, \ + $(FRAMEWORK_CM_PLATFORM_API_FILE), \ $(INTERNAL_CM_PLATFORM_API_FILE), \ - vendor/cmsdk/api/cm_removed.txt, \ + $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE), \ $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE), \ cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ check-cm-public-api, \ @@ -71,9 +71,9 @@ $(eval $(call check-api, \ .PHONY: update-cm-public-api update-cm-public-api: $(INTERNAL_CM_PLATFORM_API_FILE) | $(ACP) @echo -e ${CL_GRN}"Copying cm_current.txt"${CL_RST} - $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_API_FILE) $(TOPDIR)vendor/cmsdk/api/cm_current.txt + $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_API_FILE) $(FRAMEWORK_CM_PLATFORM_API_FILE) @echo -e ${CL_GRN}"Copying cm_removed.txt"${CL_RST} - $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE) $(TOPDIR)vendor/cmsdk/api/cm_removed.txt + $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE) $(FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE) update-cm-api : update-cm-public-api @@ -87,7 +87,7 @@ $(eval $(call check-api, \ checksystemapi-cm-last, \ $(CM_SRC_SYSTEM_API_DIR)/$(cm_last_released_sdk_version).txt, \ $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \ - vendor/cmsdk/system-api/cm_system-removed.txt, \ + $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \ $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \ cat $(BUILD_SYSTEM)/apicheck_msg_last.txt, \ check-cm-system-api, \ @@ -98,9 +98,9 @@ $(eval $(call check-api, \ # SDK version. $(eval $(call check-api, \ checksystemapi-cm-current, \ - vendor/cmsdk/system-api/cm_system-current.txt, \ + $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE), \ $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE), \ - vendor/cmsdk/system-api/cm_system-removed.txt, \ + $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \ $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE), \ cat $(BUILD_SYSTEM)/apicheck_msg_current.txt, \ check-cm-system-api, \ @@ -112,8 +112,8 @@ update-cm-api : update-cm-system-api update-cm-system-api: $(INTERNAL_PLATFORM_CM_SYSTEM_API_FILE) | $(ACP) @echo Copying cm_system-current.txt - $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE) vendor/cmsdk/system-api/cm_system-current.txt + $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE) $(FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE) @echo Copying cm_system-removed.txt - $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE) vendor/cmsdk/system-api/cm_system-removed.txt + $(hide) $(ACP) $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE) $(FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE) endif diff --git a/build/core/config.mk b/build/core/config.mk index e798368..3f6e0a2 100644 --- a/build/core/config.mk +++ b/build/core/config.mk @@ -1,8 +1,26 @@ +# Copyright (C) 2015 The 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. + CM_SRC_API_DIR := $(TOPDIR)prebuilts/cmsdk/api CM_SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/cmsdk/system-api INTERNAL_CM_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_public_api.txt INTERNAL_CM_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_removed.txt INTERNAL_CM_PLATFORM_SYSTEM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_system-api.txt INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_system-removed.txt +FRAMEWORK_CM_PLATFORM_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_current.txt +FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_removed.txt +FRAMEWORK_CM_PLATFORM_SYSTEM_API_FILE := $(TOPDIR)vendor/cmsdk/system-api/cm_system-current.txt +FRAMEWORK_CM_PLATFORM_SYSTEM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/system-api/cm_system-removed.txt BUILD_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact.mk |