From 4ff08f6b5d0de241da6d6f741d90d9f9becbe9c9 Mon Sep 17 00:00:00 2001 From: Sundong Ahn Date: Mon, 16 Jul 2018 18:19:31 +0900 Subject: Change the "since" arguments generation. If we add a new sdk library starting with android, there is a build error because of the wrong "since" argument. So we have to change to android.txt and android.xml instead of android.* in since-arg. Bug: 77577799 Test: Verified variable is the same before & after. Change-Id: I3016181a97e565ebba67c1828d76ddf9a7d6f860 --- Android.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index eddcadae456b..835630bc2390 100644 --- a/Android.mk +++ b/Android.mk @@ -180,15 +180,17 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -hidePackage com.android.server # Convert an sdk level to a "since" argument. -since-arg = -since $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/$(1)/public/api/android.*) $(1) +since-arg = -since $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/$(1)/public/api/android.$(2)) $(1) -finalized_sdks := $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.xml,%,\ - $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.xml)) -finalized_sdks += $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.txt,%,\ - $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.txt)) -finalized_sdks := $(call numerically_sort,$(finalized_sdks)) +finalized_xml_sdks := $(call numerically_sort,\ + $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.xml,%,\ + $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.xml))) +finalized_txt_sdks := $(call numerically_sort,\ + $(patsubst $(HISTORICAL_SDK_VERSIONS_ROOT)/%/public/api/android.txt,%,\ + $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.txt))) -framework_docs_LOCAL_DROIDDOC_OPTIONS += $(foreach sdk,$(finalized_sdks),$(call since-arg,$(sdk))) +framework_docs_LOCAL_DROIDDOC_OPTIONS += $(foreach sdk,$(finalized_xml_sdks),$(call since-arg,$(sdk),xml)) +framework_docs_LOCAL_DROIDDOC_OPTIONS += $(foreach sdk,$(finalized_txt_sdks),$(call since-arg,$(sdk),txt)) ifneq ($(PLATFORM_VERSION_CODENAME),REL) framework_docs_LOCAL_DROIDDOC_OPTIONS += \ -since ./frameworks/base/api/current.txt $(PLATFORM_VERSION_CODENAME) -- cgit v1.2.3