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

Merge "Include 64-bit version of libaapt2_jni.dll in windows SDK" am: 09b1e8e164

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b823a12eb90fd94f3671346b0487eee8c89be40
This commit is contained in:
Treehugger Robot
2021-01-20 20:26:40 +00:00
committed by Automerger Merge Worker
parent bda76dde0f 09b1e8e164
commit cc68faeb0b
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,6 +86,12 @@ bin/aapt2.exe strip build-tools/${PLATFORM_NAME}/aapt2
rm build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.so rm build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.so
lib/libaapt2_jni.dll strip build-tools/${PLATFORM_NAME}/libaapt2_jni.dll lib/libaapt2_jni.dll strip build-tools/${PLATFORM_NAME}/libaapt2_jni.dll
# Also include a 64-bit version of libaapt2_jni.dll for use by 64-bit JVMs.
lib64/libaapt2_jni.dll strip build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.dll
# Also include the 64-bit libwinpthread-1.dll needed by libaapt2_jni.dll.
prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/bin/libwinpthread-1.dll strip build-tools/${PLATFORM_NAME}/lib64/libwinpthread-1.dll
rm build-tools/${PLATFORM_NAME}/split-select rm build-tools/${PLATFORM_NAME}/split-select
bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe bin/split-select.exe strip build-tools/${PLATFORM_NAME}/split-select.exe

7
build/tools/windows_sdk.mk
View File

@@ -41,8 +41,15 @@ WIN_TARGETS := \
zipalign \ zipalign \
split-select split-select
# b/150355628 - we want the 64-bit libaapt2_jni for loading as JNI in 64-bit JVMs.
WIN_TARGETS += \
libaapt2_jni_64
WIN_TARGETS := $(foreach t,$(WIN_TARGETS),$(ALL_MODULES.host_cross_$(t).INSTALLED)) WIN_TARGETS := $(foreach t,$(WIN_TARGETS),$(ALL_MODULES.host_cross_$(t).INSTALLED))
WIN_TARGETS += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/bin/libwinpthread-1.dll
WIN_TARGETS += prebuilts/gcc/linux-x86/host/x86_64-w64-mingw32-4.8/x86_64-w64-mingw32/lib32/libwinpthread-1.dll
# MAIN_SDK_NAME/DIR is set in build/core/Makefile # MAIN_SDK_NAME/DIR is set in build/core/Makefile
WIN_SDK_NAME := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_NAME)) WIN_SDK_NAME := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_NAME))
WIN_SDK_DIR := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_DIR)) WIN_SDK_DIR := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_DIR))