Merge "Move apicheck.mk off SRC_API_DIR."
This commit is contained in:
@@ -92,7 +92,6 @@ MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))
|
|||||||
UNAME := $(shell uname -sm)
|
UNAME := $(shell uname -sm)
|
||||||
|
|
||||||
SRC_TARGET_DIR := $(TOPDIR)build/target
|
SRC_TARGET_DIR := $(TOPDIR)build/target
|
||||||
SRC_API_DIR := $(TOPDIR)prebuilts/sdk/api
|
|
||||||
SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/sdk/system-api
|
SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/sdk/system-api
|
||||||
SRC_TEST_API_DIR := $(TOPDIR)prebuilts/sdk/test-api
|
SRC_TEST_API_DIR := $(TOPDIR)prebuilts/sdk/test-api
|
||||||
|
|
||||||
|
@@ -25,9 +25,12 @@ ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK)))
|
|||||||
# Run the checkapi rules by default.
|
# Run the checkapi rules by default.
|
||||||
droidcore: checkapi
|
droidcore: checkapi
|
||||||
|
|
||||||
last_released_sdk_version := $(lastword $(call numerically_sort, \
|
last_released_sdk_version := \
|
||||||
$(filter-out current, \
|
$(lastword $(call numerically_sort, \
|
||||||
$(patsubst $(SRC_API_DIR)/%.txt,%, $(wildcard $(SRC_API_DIR)/*.txt)) \
|
$(patsubst \
|
||||||
|
$(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.txt,\
|
||||||
|
%,\
|
||||||
|
$(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.txt)\
|
||||||
) \
|
) \
|
||||||
))
|
))
|
||||||
|
|
||||||
@@ -45,7 +48,7 @@ checkapi : check-public-api
|
|||||||
# SDK version.
|
# SDK version.
|
||||||
$(eval $(call check-api, \
|
$(eval $(call check-api, \
|
||||||
checkpublicapi-last, \
|
checkpublicapi-last, \
|
||||||
$(SRC_API_DIR)/$(last_released_sdk_version).txt, \
|
$(HISTORICAL_SDK_VERSIONS_ROOT)/$(last_released_sdk_version)/public/api/android.txt, \
|
||||||
$(INTERNAL_PLATFORM_API_FILE), \
|
$(INTERNAL_PLATFORM_API_FILE), \
|
||||||
frameworks/base/api/removed.txt, \
|
frameworks/base/api/removed.txt, \
|
||||||
$(INTERNAL_PLATFORM_REMOVED_API_FILE), \
|
$(INTERNAL_PLATFORM_REMOVED_API_FILE), \
|
||||||
@@ -91,7 +94,7 @@ checkapi : check-system-api
|
|||||||
# SDK version.
|
# SDK version.
|
||||||
$(eval $(call check-api, \
|
$(eval $(call check-api, \
|
||||||
checksystemapi-last, \
|
checksystemapi-last, \
|
||||||
$(SRC_SYSTEM_API_DIR)/$(last_released_sdk_version).txt, \
|
$(HISTORICAL_SDK_VERSIONS_ROOT)/$(last_released_sdk_version)/system/api/android.txt, \
|
||||||
$(INTERNAL_PLATFORM_SYSTEM_API_FILE), \
|
$(INTERNAL_PLATFORM_SYSTEM_API_FILE), \
|
||||||
frameworks/base/api/system-removed.txt, \
|
frameworks/base/api/system-removed.txt, \
|
||||||
$(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE), \
|
$(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE), \
|
||||||
|
Reference in New Issue
Block a user