commit 3467bcbab01994b922165e152d448f922b2c22c3
author Diego Perez <diegoperez@google.com> Fri Feb 10 10:13:02 2023 +0000
committer Diego Perez <diegoperez@google.com> Fri Feb 10 10:28:23 2023 +0000
tree 1f182d8e5c3ac70e55e43451b4215b1a0c9f2bf2
parent 97f266f34e6a96b5f4d0aed22633337344ce6589

Move aapt2 Windows binary to 64bit

This will help solving some inconsistencies across platforms in the
shortening of resource namings caused by the different size of size_t.

Bug: 266868960
Test: atest aapt2_tests
Change-Id: Ic161bb4de4c34e8819ec69d024a7bf9ba72b12b9

tools/aapt2/Android.bp

diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index aa337e5..0d6dc35 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -50,6 +50,7 @@
     ],
     target: {
         windows: {
+            compile_multilib: "64",
             enabled: true,
             cflags: ["-Wno-maybe-uninitialized"],
             ldflags: ["-static"],