From 7b0414beb77aaf67124c3ef7f2a55a898772bd1d Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 19 Mar 2020 15:09:44 +0000
Subject: [PATCH] Add module_lib and system-server artifacts to sdk dist

Makes these artifacts available for the update_prebuilts script.

Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Ia1064e50e987433e5e308527c6770ba2d3e8bde3
---
 Android.mk          | 2 ++
 StubLibraries.bp    | 1 +
 services/Android.bp | 1 +
 3 files changed, 4 insertions(+)

diff --git a/Android.mk b/Android.mk
index 815a169f38805..beb09b94345eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -42,6 +42,8 @@ $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE))
 $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_API_FILE):apistubs/android/public/api/android.txt)
 $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_API_FILE):apistubs/android/system/api/android.txt)
 $(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_TEST_API_FILE):apistubs/android/test/api/android.txt)
+$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_MODULE_LIB_API_FILE):apistubs/android/module-lib/api/android.txt)
+$(call dist-for-goals,sdk,$(INTERNAL_PLATFORM_SYSTEM_SERVER_API_FILE):apistubs/android/system-server/api/android.txt)
 
 # sdk.atree needs to copy the whole dir: $(OUT_DOCS)/offline-sdk to the final zip.
 # So keep offline-sdk-timestamp target here, and unzip offline-sdk-docs.zip to
diff --git a/StubLibraries.bp b/StubLibraries.bp
index da9f1654d60fc..809b809f5c964 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -195,6 +195,7 @@ droidstubs {
 droidstubs {
     name: "module-lib-api",
     defaults: ["metalava-full-api-stubs-default"],
+    api_tag_name: "MODULE_LIB",
     arg_files: ["core/res/AndroidManifest.xml"],
     args: metalava_framework_docs_args + module_libs,
     check_api: {
diff --git a/services/Android.bp b/services/Android.bp
index 024155d7dcbed..490481c7e5a27 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -116,6 +116,7 @@ droidstubs {
     name: "services-stubs.sources",
     srcs: [":services-all-sources"],
     installable: false,
+    api_tag_name: "SYSTEM_SERVER",
     args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +
         " --hide-annotation android.annotation.Hide" +
         " --hide InternalClasses" + // com.android.* classes are okay in this interface