Snap for 4905103 from a66fb8f32f5a956f143c8719b00076144835aa5f to pi-dr1-release
Change-Id: If3b76406ea1654e453edac8bb96a8cdf5c0b7322
diff --git a/build/Android.mk b/build/Android.mk
index db55681..4fa56f9 100644
--- a/build/Android.mk
+++ b/build/Android.mk
@@ -150,7 +150,7 @@
ALL_SDK_FILES += $(HOST_OUT)/development/sdk/generated-api-versions.xml
-api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-26.0.0.jar
+api_gen_jar := $(TOPDIR)prebuilts/tools/common/api-generator/api-generator-26.3.0.jar
api_gen_deps := \
$(TOPDIR)prebuilts/tools/common/m2/repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar \
$(TOPDIR)prebuilts/tools/common/m2/repository/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar \
diff --git a/build/sdk.atree b/build/sdk.atree
index 410d354..a16234d 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -91,7 +91,8 @@
external/clang/lib/Headers build-tools/${PLATFORM_NAME}/renderscript/clang-include
external/clang/LICENSE.TXT build-tools/${PLATFORM_NAME}/renderscript/clang-include/LICENSE.TXT
-prebuilts/sdk/renderscript/lib/javalib.jar build-tools/${PLATFORM_NAME}/renderscript/lib/renderscript-v8.jar
+prebuilts/sdk/renderscript/lib/javalib.jar build-tools/${PLATFORM_NAME}/renderscript/lib/androidx-rs.jar
+prebuilts/sdk/renderscript/lib/javalib_legacy.jar build-tools/${PLATFORM_NAME}/renderscript/lib/renderscript-v8.jar
prebuilts/sdk/renderscript/lib/arm/libc.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libc.so
prebuilts/sdk/renderscript/lib/arm/libm.so build-tools/${PLATFORM_NAME}/renderscript/lib/intermediates/armeabi-v7a/libm.so
