commit 91967398ad528f87d520b93049692810dbf0ca14
author Nan Zhang <nanzhang@google.com> Fri Jun 08 21:36:18 2018 -0700
committer Nan Zhang <nanzhang@google.com> Sat Jun 09 21:13:25 2018 +0000
tree b3f9a390bc25380eda73ca076fdfbcc7c5d9f11f
parent 3a1dcff97b22cc566fc33b655d595fcd61dbb42e

Dist-for-goal metalava-android.jar

Test: N/A
Bug: b/78245848
Change-Id: I277e1fbb57a8a77ebab789cc443cbe2a88c9633f
Merged-In: I5180bc18979415cec6255beb3fe2c48ec298d3ae

build/Android.mk

diff --git a/build/Android.mk b/build/Android.mk
index db55681..e3283b6 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -95,23 +95,7 @@
 .PHONY: metalava_android_stubs
 metalava_android_stubs: $(full_target) $(full_src_target)
 
-# android.jar is what we put in the SDK package.
-android_jar_intermediates := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/metalava_android_jar_intermediates
-android_jar_full_target := $(android_jar_intermediates)/metalava-android.jar
-android_jar_src_target := $(android_jar_intermediates)/metalava-android-stubs-src.jar
-
-$(android_jar_full_target): $(full_target)
-	@echo Package SDK Stubs: $@
-	$(copy-file-to-target)
-
-$(android_jar_src_target): $(full_src_target)
-	@echo Package SDK Stubs Source: $@
-	$(hide)mkdir -p $(dir $@)
-	$(hide)$(ACP) $< $@
-
-ALL_SDK_FILES += $(android_jar_full_target)
-ALL_SDK_FILES += $(android_jar_src_target)
-
+$(call dist-for-goals,sdk win_sdk,$(full_target):metalava_android.jar)
 # ====================================================
 
 # The uiautomator stubs