LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Revert "Make sdk depend on merged srcjar instead of monolith"" am: 56c15a5e02

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1490698

Change-Id: Ic44462483265f74772fcae572036adc20ef37d77
This commit is contained in:
Colin Cross
2020-11-06 19:40:36 +00:00
committed by Automerger Merge Worker
parent 442f44b125 56c15a5e02
commit 908089e9a0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/Android.mk
View File

@@ -58,7 +58,7 @@ $(sample_props) : $(HOST_OUT)/development/samples/%_source.properties : $(TOPDIR
# ===== SDK jar file of stubs ===== # ===== SDK jar file of stubs =====
# A.k.a the "current" version of the public SDK (android.jar inside the SDK package). # 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_target := $(call intermediates-dir-for,JAVA_LIBRARIES,android_stubs_current,,COMMON)/classes.jar
full_src_target := $(call intermediates-dir-for,ETC,frameworks-base-api-current.srcjar)/frameworks-base-api-current.srcjar full_src_target := $(OUT_DOCS)/api-stubs-docs-stubs.srcjar
# android.jar is what we put in the SDK package. # android.jar is what we put in the SDK package.
android_jar_intermediates := $(call intermediates-dir-for,PACKAGING,android_jar,,COMMON) android_jar_intermediates := $(call intermediates-dir-for,PACKAGING,android_jar,,COMMON)