Merge "Make sdk depend on merged srcjar instead of monolith" am: a368dc8c05 am: 442f44b125

Original change: https://android-review.googlesource.com/c/platform/development/+/1489277

Change-Id: I1bb4e3a09927f29ac7b435f5a96b85e5366413fa
This commit is contained in:
Anton Hansson
2020-11-06 16:09:48 +00:00
committed by Automerger Merge Worker

View File

@@ -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)