Merge "Include 64-bit version of libaapt2_jni.dll in windows SDK"

aosp-mirror · Jan 20, 2021 · 09b1e8e · 09b1e8e
2 parents 917272a + b9d10f8
commit 09b1e8e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/build/sdk-windows-x86.atree b/build/sdk-windows-x86.atree
@@ -86,6 +86,12 @@ bin/aapt2.exe                           strip build-tools/${PLATFORM_NAME}/aapt2
 rm build-tools/${PLATFORM_NAME}/lib64/libaapt2_jni.so
 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
 bin/split-select.exe                    strip build-tools/${PLATFORM_NAME}/split-select.exe
 

diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
@@ -41,8 +41,15 @@ WIN_TARGETS := \
 	zipalign \
 	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 += 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
 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))