From 6a04a23a52642ec226e6e2b1eeab4498b0923b06 Mon Sep 17 00:00:00 2001 From: Adnan Begovic Date: Thu, 10 Mar 2016 12:01:04 -0800 Subject: [PATCH] cm: Always verify against current CMSDK version. Since cmsdk prebuilts lives in a single master branch, previous branches that apicheck will fail since they'll verify against an api that exists in future releases. Change-Id: I56594d075b89cb1a3d7a606cc9c1699dfffd94cb TICKET: CYNGNOS-2220 --- build/tasks/apicheck.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build/tasks/apicheck.mk b/build/tasks/apicheck.mk index 219e9246..3be3cae1 100644 --- a/build/tasks/apicheck.mk +++ b/build/tasks/apicheck.mk @@ -25,11 +25,8 @@ ifeq (,$(filter true, $(WITHOUT_CHECK_API) $(TARGET_BUILD_PDK))) # Run the checkapi rules by default. droidcore: checkapi-cm -cm_last_released_sdk_version := $(lastword $(call numerically_sort, \ - $(filter-out current, \ - $(patsubst $(CM_SRC_API_DIR)/%.txt,%, $(wildcard $(CM_SRC_API_DIR)/*.txt)) \ - )\ - )) +# Validate against current platform sdk version api text within prebuilts +cm_last_released_sdk_version := $(CM_PLATFORM_SDK_VERSION) .PHONY: check-cm-public-api checkapi-cm : check-cm-public-api