From 1ed8eb8372e1e4e42c862bf3bae9c6200f61c88e Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 5 Nov 2020 21:08:45 +0000 Subject: [PATCH] Re-submit "Make sdk depend on merged srcjar instead of monolith" Bug: 158465496 Test: lunch sdk_phone_armv7; m sdk Change-Id: I204ff3cc043dbc6d2a5383f87a067fc82caee3db Merged-In: I204ff3cc043dbc6d2a5383f87a067fc82caee3db --- build/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Android.mk b/build/Android.mk index f2b559db4..441363847 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -58,7 +58,7 @@ $(sample_props) : $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR # ===== SDK jar file of stubs ===== # A.k.a the "current" version of the public SDK (android.jar inside the SDK package). full_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_stubs_current,,COMMON)/classes.jar -full_src_target := $(OUT_DOCS)/api-stubs-docs-stubs.srcjar +full_src_target := $(call intermediates-dir-for,ETC,frameworks-base-api-current.srcjar)/frameworks-base-api-current.srcjar # android.jar is what we put in the SDK package. android_jar_intermediates := $(call intermediates-dir-for,PACKAGING,android_jar,,COMMON)