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

Commit 5a6f2501 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Update apidiff source files to use new api location." into pi-dev-plus-aosp 

am: e16051a0

Change-Id: I533d3a012b2e1641b7da7b9a36c5bb4690c65969
parents 8f214481 e16051a0

Android.mk

+16 −14
Original line number Original line Diff line number Diff line
@@ -245,6 +245,18 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS += \ 
		-federate AndroidX https://developer.android.com \

		-federate AndroidX https://developer.android.com \

		-federationapi AndroidX prebuilts/sdk/current/androidx-api.txt

		-federationapi AndroidX prebuilts/sdk/current/androidx-api.txt





# Get the highest numbered api txt for the given api level.

# $(1): the api level (e.g. public, system)

define highest_sdk_txt

$(HISTORICAL_SDK_VERSIONS_ROOT)/$(lastword $(call numerically_sort, \

    $(patsubst \

        $(HISTORICAL_SDK_VERSIONS_ROOT)/%,\

        %,\

        $(wildcard $(HISTORICAL_SDK_VERSIONS_ROOT)/*/$(1)/api/android.txt)\

    ) \

))

endef



# ====  Public API diff ===========================

# ====  Public API diff ===========================

include $(CLEAR_VARS)

include $(CLEAR_VARS)
@@ -260,13 +272,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \ 




LOCAL_MODULE := offline-sdk-referenceonly

LOCAL_MODULE := offline-sdk-referenceonly





last_released_sdk_version := $(lastword $(call numerically_sort, \

# Basename, because apidiff adds .txt internally.

			$(filter-out current, \

LOCAL_APIDIFF_OLDAPI := $(basename $(call highest_sdk_txt,public))

				$(patsubst $(SRC_API_DIR)/%.txt,%, $(wildcard $(SRC_API_DIR)/*.txt)) \

			 )\

		))



LOCAL_APIDIFF_OLDAPI := $(LOCAL_PATH)/../../$(SRC_API_DIR)/$(last_released_sdk_version)

LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_API_FILE))

LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_API_FILE))





include $(BUILD_APIDIFF)

include $(BUILD_APIDIFF)
@@ -290,13 +297,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \ 




LOCAL_MODULE := offline-system-sdk-referenceonly

LOCAL_MODULE := offline-system-sdk-referenceonly





last_released_sdk_version := $(lastword $(call numerically_sort, \

# Basename, because apidiff adds .txt internally.

			$(filter-out current, \

LOCAL_APIDIFF_OLDAPI := $(basename $(call highest_sdk_txt,system))

				$(patsubst $(SRC_SYSTEM_API_DIR)/%.txt,%, $(wildcard $(SRC_SYSTEM_API_DIR)/*.txt)) \

			 )\

		))



LOCAL_APIDIFF_OLDAPI := $(LOCAL_PATH)/../../$(SRC_SYSTEM_API_DIR)/$(last_released_sdk_version)

LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_SYSTEM_API_FILE))

LOCAL_APIDIFF_NEWAPI := $(LOCAL_PATH)/../../$(basename $(INTERNAL_PLATFORM_SYSTEM_API_FILE))





include $(BUILD_APIDIFF)

include $(BUILD_APIDIFF)