From 858113cdae87738d7d42cd2db5a00de93c3063a6 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Thu, 19 Mar 2020 15:17:52 +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: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
Merged-In: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
(cherry picked from commit b4aca10721d9aa13a2baaea7f4d425a470abdd6e)
---
 build/Android.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/build/Android.mk b/build/Android.mk
index 9c22a24a2..21770acfa 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -137,3 +137,19 @@ android_test_stubs: $(full_target)
 # Build and store the android_test.jar.
 $(call dist-for-goals,sdk win_sdk,$(full_target):android_test.jar)
 $(call dist-for-goals,sdk win_sdk,$(full_target):apistubs/android/test/android.jar)
+
+# ============ Module Lib SDK ============
+full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_module_lib_stubs_current,,COMMON)/classes.jar
+
+.PHONY: android_module_lib_stubs
+android_module_lib_stubs: $(full_target)
+
+$(call dist-for-goals,sdk win_sdk,$(full_target):apistubs/android/module-lib/android.jar)
+
+# ============ System server SDK ============
+full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_system_server_stubs_current,,COMMON)/classes.jar
+
+.PHONY: android_system_server_stubs
+android_system_server_stubs: $(full_target)
+
+$(call dist-for-goals,sdk win_sdk,$(full_target):apistubs/android/system-server/android.jar)