From 319fc02cb8e5ea2e8cc65f3f1f792ef0b82556eb Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 6 May 2019 11:54:41 -0700 Subject: [PATCH] Build aapt2 statically on windows Prebuilt script is no longer updating libwinpthread-1.dll. Link the windows executable statically so aapt2 will no longer require the dependency on the dll. Bug: 131883685 Test: manual test of aapt2.exe on windows without libwinpthread-1.dll Change-Id: If78a8ec3030003862c18e3967e4d8333fde7928a --- tools/aapt2/Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp index 326c88d470645..53372bff3e67f 100644 --- a/tools/aapt2/Android.bp +++ b/tools/aapt2/Android.bp @@ -41,6 +41,7 @@ cc_defaults { windows: { enabled: true, cflags: ["-Wno-maybe-uninitialized"], + ldflags: ["-static"], }, darwin: { cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],