diff options
| author | Sundong Ahn <sundongahn@google.com> | 2018-08-01 15:55:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-01 15:55:02 -0700 |
| commit | 0cb078bba2a01f24a8e3e156520dd5263f10a6ef (patch) | |
| tree | 2ce2396fe1e1f2fa1ae785be5ea06f7b0a868f9e | |
| parent | 8f4fdd4e78d686c829b25ad20fa8418e3bc0e90e (diff) | |
| parent | ea77ee39f5399705743443bcf94e49997e2e6237 (diff) | |
Merge "Change the "since" arguments generation."
am: ea77ee39f5
Change-Id: Ia00ed78e8b22875ad2aba2877f6a6b78f7683e81
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index f81f756d43cd..882f7a3d7a9a 100644 --- a/Android.mk +++ b/Android.mk @@ -171,15 +171,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) |