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

Merge "Add shrinkedAndroid.jar to build tools"

Browse Source 
am: 1a9b850c50

Change-Id: I4a3da887d12d3d674e79610cd844015706d7c1b8
This commit is contained in:
Ivan Gavrilovic
2017-10-02 10:01:12 +00:00
committed by android-build-merger
parent fdf80c3761 1a9b850c50
commit a578e61335
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/Android.mk
View File

@@ -106,6 +106,9 @@ ALL_SDK_FILES += $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.ht
# core-lambda-stubs
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
# $(1): the Java library name
define _package_sdk_library
$(eval _psm_build_module := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/$(1)_intermediates/javalib.jar)

6
build/sdk.atree
View File

@@ -140,9 +140,9 @@ framework/dx.jar build-tools/${PLATFORM_NAME}/lib/d
bin/dexdump build-tools/${PLATFORM_NAME}/dexdump
# multi-dex
prebuilts/sdk/tools/lib/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
${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
# Jack & Jill
prebuilts/sdk/tools/jacks/jack-${JACK_SDKTOOL_VERSION}.jar build-tools/${PLATFORM_NAME}/jack.jar