Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9f5c2c1 authored by Sundong Ahn's avatar Sundong Ahn Committed by android-build-merger
Browse files

Merge "Change the "since" arguments generation." am: ea77ee39 am: 0cb078bb am: 008e32bf 

am: a8f3d0c2

Change-Id: I8b2bb408eb3aecb17f4fd5604d0cb6dcb2369ccd
parents 2bddc614 a8f3d0c2

Android.mk

+9 −7
Original line number Original line Diff line number Diff line
@@ -171,15 +171,17 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -hidePackage com.android.server

    -hidePackage com.android.server





# Convert an sdk level to a "since" argument.

# 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,%,\

finalized_xml_sdks := $(call numerically_sort,\

    $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.xml))

    $(patsubst $(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.xml)))

    $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/public/api/android.txt))

finalized_txt_sdks := $(call numerically_sort,\

finalized_sdks := $(call numerically_sort,$(finalized_sdks))

     $(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)

ifneq ($(PLATFORM_VERSION_CODENAME),REL)

  framework_docs_LOCAL_DROIDDOC_OPTIONS += \

  framework_docs_LOCAL_DROIDDOC_OPTIONS += \

      -since ./frameworks/base/api/current.txt $(PLATFORM_VERSION_CODENAME)

      -since ./frameworks/base/api/current.txt $(PLATFORM_VERSION_CODENAME)