summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/Android.mk8
-rw-r--r--sys-img/images_x86_64_source.prop_template2
-rw-r--r--sys-img/images_x86_source.prop_template2
3 files changed, 8 insertions, 4 deletions
diff --git a/build/Android.mk b/build/Android.mk
index d18a2d789..220fee77d 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -113,10 +113,14 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-s
ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
# ======= Lint API XML ===========
-ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.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)
# ======= Lint Annotations zip ===========
-ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_annotations.zip
+full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_annotations.zip
+ALL_SDK_FILES += $(full_target)
+$(call dist-for-goals,sdk win_sdk,$(full_target):data/annotations.zip)
# ============ SDK AIDL ============
$(eval $(call copy-one-file,$(FRAMEWORK_AIDL),$(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework.aidl))
diff --git a/sys-img/images_x86_64_source.prop_template b/sys-img/images_x86_64_source.prop_template
index 5ee21612e..26fdbdc9a 100644
--- a/sys-img/images_x86_64_source.prop_template
+++ b/sys-img/images_x86_64_source.prop_template
@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK System Image
Pkg.UserSrc=false
-Pkg.Revision=6
+Pkg.Revision=7
Pkg.Dependencies=emulator#29.1.11
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
diff --git a/sys-img/images_x86_source.prop_template b/sys-img/images_x86_source.prop_template
index e0de6b54c..438422b16 100644
--- a/sys-img/images_x86_source.prop_template
+++ b/sys-img/images_x86_source.prop_template
@@ -1,6 +1,6 @@
Pkg.Desc=Android SDK System Image
Pkg.UserSrc=false
-Pkg.Revision=6
+Pkg.Revision=7
Pkg.Dependencies=emulator#29.1.11
AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}