Merge "Re-submit "Make sdk depend on merged srcjar instead of monolith"" am: 2686ccd91a am: b85906517b

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

Change-Id: I5ee6b3bd3ece62697bcaa6d0938aefde36fd9efc
This commit is contained in:
Anton Hansson
2020-11-10 14:03:26 +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)