Merge "Remove references to win_sdk" am: 65b493960f am: d5395d93a4 am: 2e8c595080

Original change: https://android-review.googlesource.com/c/platform/development/+/1936081

Change-Id: I708d6b5cb57afc536613993ce47e17a61270033c
This commit is contained in:
Anton Hansson
2022-01-05 19:10:40 +00:00
committed by Automerger Merge Worker

View File

@@ -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))