Merge "Revert^2 "Define core-current-stubs-for-system-modules-exportable"" into main

Author: Treehugger Robot

build/sdk.atree

@@ -44,7 +44,7 @@ ${OUT_DIR}/target/common/obj/PACKAGING/android_jar_intermediates/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
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-current-stubs-for-system-modules-exportable_intermediates/classes.jar    platforms/${PLATFORM_NAME}/core-for-system-modules.jar
 
 # optional API files.
 development/build/optional.json                                                               platforms/${PLATFORM_NAME}/optional/optional.json

build/tools/sdk-preprocess-files.mk

@@ -82,7 +82,7 @@ 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
+ALL_SDK_FILES += $(call intermediates-dir-for,JAVA_LIBRARIES,core-current-stubs-for-system-modules-exportable,,COMMON)/classes.jar
 
 # ====================================================