From 89c5517a2808e40c2fb12b7c6edcecdda000ddc1 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 4 Nov 2019 14:52:47 -0800 Subject: [PATCH] Package core-current-stubs-for-system-modules into the SDK core-current-stubs-for-system-modules needs to be distributed in the SDK to allow apps to be built with javac -source 9 -target 9. Bug: 143209928 Test: m TARGET_PRODUCT=sdk_phone_x86 TARGET_BUILD_VARIANT=userdebug sdk sdk_repo dist Change-Id: I9d67344f159f9482567323f27c5a8e4e060e1f1a --- build/Android.mk | 6 +++++- build/sdk.atree | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build/Android.mk b/build/Android.mk index 21770acfa..d18a2d789 100644 --- a/build/Android.mk +++ b/build/Android.mk @@ -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 diff --git a/build/sdk.atree b/build/sdk.atree index 9ea4040a1..aa18fcea5 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -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