tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move apicheck.mk off SRC_API_DIR." am: a1dc661f71

Browse source 
am: 02cae4c505

Change-Id: I93bcd3521b72eb932d3aeed2a5a5dc4d1a9bc35e
This commit is contained in:
Anton Hansson 2018-05-03 06:31:48 -07:00 committed by android-build-merger
commit 272035c19c
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/config.mk
View file

@ -92,7 +92,6 @@ MAKECMDGOALS := $(strip $(filter-out dist,$(MAKECMDGOALS)))
UNAME := $(shell uname -sm)
SRC_TARGET_DIR := $(TOPDIR)build/target
SRC_API_DIR := $(TOPDIR)prebuilts/sdk/api
SRC_SYSTEM_API_DIR := $(TOPDIR)prebuilts/sdk/system-api
SRC_TEST_API_DIR := $(TOPDIR)prebuilts/sdk/test-api

17
core/tasks/apicheck.mk
View file

@ -25,11 +25,14 @@ ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK)))
# Run the checkapi rules by default.
droidcore: checkapi
last_released_sdk_version := $(lastword $(call numerically_sort, \
$(filter-out current, \
$(patsubst $(SRC_API_DIR)/%.txt,%, $(wildcard $(SRC_API_DIR)/*.txt)) \
)\
))
last_released_sdk_version := \
$(lastword $(call numerically_sort, \
$(patsubst \
$(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.txt,\
%,\
$(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.txt)\
) \
))
.PHONY: check-public-api
checkapi : check-public-api
@ -45,7 +48,7 @@ checkapi : check-public-api
# SDK version.
$(eval $(call check-api, \
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), \
frameworks/base/api/removed.txt, \
$(INTERNAL_PLATFORM_REMOVED_API_FILE), \
@ -91,7 +94,7 @@ checkapi : check-system-api
# SDK version.
$(eval $(call check-api, \
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), \
frameworks/base/api/system-removed.txt, \
$(INTERNAL_PLATFORM_SYSTEM_REMOVED_API_FILE), \