From ac1887227db6a26b149eb620fc149eadab89734b Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Fri, 17 Apr 2020 11:44:30 +0100 Subject: [PATCH] Remove _API_FILE variables There are no known usages of these variables, and they've been incorrectly set for a long time. The phony for $(LOCAL_MODULE) in droiddoc to build the api txt has been moved to soong. Bug: 152479829 Test: m Change-Id: I31742e50d1af42fb899c7a3436af5647bd90cc47 --- core/config.mk | 13 ------------- core/soong_droiddoc_prebuilt.mk | 5 ----- 2 files changed, 18 deletions(-) diff --git a/core/config.mk b/core/config.mk index b329b0d687..f086a9aab7 100644 --- a/core/config.mk +++ b/core/config.mk @@ -1149,19 +1149,6 @@ TARGET_AVAIALBLE_SDK_VERSIONS := $(call numerically_sort,$(TARGET_AVAILABLE_SDK_ TARGET_SDK_VERSIONS_WITHOUT_JAVA_18_SUPPORT := $(call numbers_less_than,24,$(TARGET_AVAILABLE_SDK_VERSIONS)) TARGET_SDK_VERSIONS_WITHOUT_JAVA_19_SUPPORT := $(call numbers_less_than,30,$(TARGET_AVAILABLE_SDK_VERSIONS)) -ifndef INTERNAL_PLATFORM_PRIVATE_API_FILE -INTERNAL_PLATFORM_PRIVATE_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/private.txt -endif -ifndef INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE -INTERNAL_PLATFORM_PRIVATE_DEX_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/private-dex.txt -endif -ifndef INTERNAL_PLATFORM_SYSTEM_PRIVATE_API_FILE -INTERNAL_PLATFORM_SYSTEM_PRIVATE_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-private.txt -endif -ifndef INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE -INTERNAL_PLATFORM_SYSTEM_PRIVATE_DEX_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/system-private-dex.txt -endif - # Missing optional uses-libraries so that the platform doesn't create build rules that depend on # them. INTERNAL_PLATFORM_MISSING_USES_LIBRARIES := \ diff --git a/core/soong_droiddoc_prebuilt.mk b/core/soong_droiddoc_prebuilt.mk index 4e082bff73..c0467df2be 100644 --- a/core/soong_droiddoc_prebuilt.mk +++ b/core/soong_droiddoc_prebuilt.mk @@ -12,11 +12,6 @@ ALL_DOCS += $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar $(LOCAL_MODULE) : $(OUT_DOCS)/$(LOCAL_MODULE)-stubs.srcjar endif -ifdef INTERNAL_PLATFORM_API_FILE -.PHONY: $(LOCAL_MODULE) $(LOCAL_MODULE).txt -$(LOCAL_MODULE) $(LOCAL_MODULE).txt : $(INTERNAL_PLATFORM_API_FILE) $(INTERNAL_PLATFORM_REMOVED_API_FILE) -endif - ifdef LOCAL_DROIDDOC_DOC_ZIP $(eval $(call copy-one-file,$(LOCAL_DROIDDOC_DOC_ZIP),$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)) $(call dist-for-goals,docs,$(OUT_DOCS)/$(LOCAL_MODULE)-docs.zip)