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

Merge "Remove mainDexClasses from the SDK" am: 8e7a1df497 am: 063e6e21df am: ba1815693e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/1828912

Change-Id: If35c17b488a37df6afdf4a22a2f37c07b643d899
This commit is contained in:
Colin Cross
2021-09-17 22:42:40 +00:00
committed by Automerger Merge Worker
parent a02ee954c0 ba1815693e
commit 31584384c2
5 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/Android.mk
View File

@@ -104,9 +104,6 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.
# core-lambda-stubs # core-lambda-stubs
ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar
# shrinkedAndroid.jar for multidex support
ALL_SDK_FILES += $(HOST_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar
# ======= Lint API XML =========== # ======= Lint API XML ===========
full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml full_target := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/framework-doc-stubs_generated-api-versions.xml
ALL_SDK_FILES += $(full_target) ALL_SDK_FILES += $(full_target)

2
build/sdk-darwin-x86.atree
View File

@@ -46,8 +46,6 @@ prebuilts/sdk/tools/darwin/lld-bin/lld strip build-tools/${PLATFOR
prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib prebuilts/sdk/tools/darwin/lib64/libc++.1.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++.1.dylib
prebuilts/sdk/tools/darwin/lib64/libc++abi.1.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++abi.1.dylib prebuilts/sdk/tools/darwin/lib64/libc++abi.1.dylib strip build-tools/${PLATFORM_NAME}/lib64/libc++abi.1.dylib
dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses
############################################################################## ##############################################################################
# Docs Component # Docs Component
############################################################################## ##############################################################################

2
build/sdk-linux-x86.atree
View File

@@ -44,5 +44,3 @@ prebuilts/sdk/tools/lld-dummy build-tools/${PLATFORM_NAME}/mipsel-linux-android
prebuilts/sdk/tools/lld build-tools/${PLATFORM_NAME}/lld prebuilts/sdk/tools/lld build-tools/${PLATFORM_NAME}/lld
prebuilts/sdk/tools/linux/lld-bin/lld strip build-tools/${PLATFORM_NAME}/lld-bin/lld prebuilts/sdk/tools/linux/lld-bin/lld strip build-tools/${PLATFORM_NAME}/lld-bin/lld
prebuilts/sdk/tools/linux/lib64/libc++.so.1 strip build-tools/${PLATFORM_NAME}/lib64/libc++.so.1 prebuilts/sdk/tools/linux/lib64/libc++.so.1 strip build-tools/${PLATFORM_NAME}/lib64/libc++.so.1
dalvik/dx/etc/mainDexClasses build-tools/${PLATFORM_NAME}/mainDexClasses

2
build/sdk-windows-x86.atree
View File

@@ -160,8 +160,6 @@ bin/lld.exe strip build-tools/${
prebuilts/sdk/tools/windows/lld-bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld-bin/lld.exe prebuilts/sdk/tools/windows/lld-bin/lld.exe strip build-tools/${PLATFORM_NAME}/lld-bin/lld.exe
prebuilts/sdk/tools/windows/lld-bin/libwinpthread-1.dll strip build-tools/${PLATFORM_NAME}/lld-bin/libwinpthread-1.dll prebuilts/sdk/tools/windows/lld-bin/libwinpthread-1.dll strip build-tools/${PLATFORM_NAME}/lld-bin/libwinpthread-1.dll
dalvik/dx/etc/mainDexClasses.bat build-tools/${PLATFORM_NAME}/mainDexClasses.bat
############################################################################## ##############################################################################
# Docs Component # Docs Component

5
build/sdk.atree
View File

@@ -131,11 +131,6 @@ bin/dexdump build-tools/${PLATFORM_NAME}/dexdu
prebuilts/r8/r8.jar build-tools/${PLATFORM_NAME}/lib/d8.jar prebuilts/r8/r8.jar build-tools/${PLATFORM_NAME}/lib/d8.jar
prebuilts/r8/d8 build-tools/${PLATFORM_NAME}/d8 prebuilts/r8/d8 build-tools/${PLATFORM_NAME}/d8
# multi-dex
${OUT_DIR}/host/common/obj/JAVA_LIBRARIES/shrinkedAndroid_intermediates/shrinkedAndroid.jar build-tools/${PLATFORM_NAME}/lib/shrinkedAndroid.jar
dalvik/dx/etc/mainDexClasses.rules build-tools/${PLATFORM_NAME}/mainDexClasses.rules
dalvik/dx/etc/mainDexClassesNoAapt.rules build-tools/${PLATFORM_NAME}/mainDexClassesNoAapt.rules
# Lambda stubs for use by javac # 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 ${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/core-lambda-stubs_intermediates/classes.jar build-tools/${PLATFORM_NAME}/core-lambda-stubs.jar