Merge "Add core-lambda-stubs.jar to the SDK"

Author: colincross

build/Android.mk

@@ -103,6 +103,9 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android_uiaut
 # org.apache.http.legacy.jar stubs
 ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/javalib.jar
 
+# core-lambda-stubs
+ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar
+
 # $(1): the Java library name
 define _package_sdk_library
 $(eval _psm_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(1)_intermediates/javalib.jar)

build/sdk.atree

@@ -152,6 +152,8 @@ prebuilts/sdk/tools/jills/jill-${JACK_SDKTOOL_VERSION}.jar                build-
 prebuilts/sdk/tools/jack-jacoco-reporter.jar                              build-tools/${PLATFORM_NAME}/jack-jacoco-reporter.jar
 prebuilts/sdk/tools/jack-coverage-plugin.jar                              build-tools/${PLATFORM_NAME}/jack-coverage-plugin.jar
 
+# Lambda stubs for use by javac
+${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar       build-tools/${PLATFORM_NAME}/core-lambda-stubs.jar
 
 ##############################################################################
 # Platform Component