From 3467bcbab01994b922165e152d448f922b2c22c3 Mon Sep 17 00:00:00 2001
From: Diego Perez <diegoperez@google.com>
Date: Fri, 10 Feb 2023 10:13:02 +0000
Subject: [PATCH] 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 | 1 +
 1 file changed, 1 insertion(+)

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