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

Merge "Package core-current-stubs-for-system-modules into the SDK" am: 56d21f5ebb

Browse Source 
Change-Id: I59f542a35b61c8cbc52adbb13c14ff1e2ed230c5
This commit is contained in:
Colin Cross
2020-04-21 22:46:19 +00:00
committed by Automerger Merge Worker
parent 1536cb65fd 56d21f5ebb
commit 73e25944a0
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/Android.mk
View File

@@ -64,7 +64,7 @@ full_src_target := $(OUT_DOCS)/api-stubs-docs-stubs.srcjar
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/android_jar_intermediates
android_jar_intermediates := $(call intermediates-dir-for,PACKAGING,android_jar,,COMMON)
android_jar_full_target := $(android_jar_intermediates)/android.jar
android_jar_src_target := $(android_jar_intermediates)/android-stubs-src.jar
@@ -89,6 +89,10 @@ $(android_jar_src_target): $(full_src_target)
ALL_SDK_FILES += $(android_jar_full_target)
ALL_SDK_FILES += $(android_jar_src_target)
# ===== SDK for system modules =====
# A subset of the public SDK to convert to system modules for use with javac -source 9 -target 9
ALL_SDK_FILES += $(call intermediates-dir-for,JAVA_LIBRARIES,core-current-stubs-for-system-modules,,COMMON)/classes.jar
# ====================================================
# The uiautomator stubs

3
build/sdk.atree
View File

@@ -164,6 +164,9 @@ sdk/sdk-build.prop
${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android.jar platforms/${PLATFORM_NAME}/android.jar
${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/android-stubs-src.jar platforms/${PLATFORM_NAME}/android-stubs-src.jar
# core-for-system-modules.jar for building system modules
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-current-stubs-for-system-modules_intermediates/classes.jar platforms/${PLATFORM_NAME}/core-for-system-modules.jar
# optional API files.
development/build/optional.json platforms/${PLATFORM_NAME}/optional/optional.json
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/classes.jar platforms/${PLATFORM_NAME}/optional/org.apache.http.legacy.jar