commit 319fc02cb8e5ea2e8cc65f3f1f792ef0b82556eb
author Ryan Mitchell <rtmitchell@google.com> Mon May 06 11:54:41 2019 -0700
committer Ryan Mitchell <rtmitchell@google.com> Mon May 06 19:07:58 2019 +0000
tree acb8e4a7565bf84dbc5c4eea2afcd75f1ed97e71
parent dd76b346d411b50a56927b36ae10de013afb0974

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

diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 326c88d..53372bf 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -41,6 +41,7 @@
         windows: {
             enabled: true,
             cflags: ["-Wno-maybe-uninitialized"],
+            ldflags: ["-static"],
         },
         darwin: {
             cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],