From 3d6f96446aa607471e62ba41fb15775d4840e965 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Tue, 4 Jan 2022 09:11:17 +0000 Subject: [PATCH] Remove references to win_sdk This goal doesn't exist anymore. The build system automatically translates it to "sdk". Test: m win_sdk dist && inspect out/dist/apistubs Change-Id: Iebe902b44cbdc76e62d38617ae549ef1c0cdf729 --- build/Android.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Android.mk b/build/Android.mk index 8305ec176..0c12be3bb 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -103,21 +103,21 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test. # ======= Lint API XML =========== full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml ALL_SDK_FILES += $(full_target) -$(call dist-for-goals,sdk win_sdk,$(full_target):data/api-versions.xml) +$(call dist-for-goals,sdk,$(full_target):data/api-versions.xml) # ======= Lint Annotations zip =========== full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/sdk-annotations.zip $(eval $(call copy-one-file,$(call intermediates-dir-for,ETC,sdk-annotations.zip)/sdk-annotations.zip,$(full_target))) ALL_SDK_FILES += $(full_target) -$(call dist-for-goals,sdk win_sdk,$(full_target):data/annotations.zip) +$(call dist-for-goals,sdk,$(full_target):data/annotations.zip) # ======= Lint system API XML =========== full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-system-stubs_generated-api-versions.xml -$(call dist-for-goals,sdk win_sdk,$(full_target):system-data/api-versions.xml) +$(call dist-for-goals,sdk,$(full_target):system-data/api-versions.xml) # ======= Lint system Annotations zip =========== full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-system-stubs_annotations.zip -$(call dist-for-goals,sdk win_sdk,$(full_target):system-data/annotations.zip) +$(call dist-for-goals,sdk,$(full_target):system-data/annotations.zip) # ============ SDK AIDL ============ $(eval $(call copy-one-file,$(FRAMEWORK_AIDL),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl))