From 4fb65c76203b77b5e7b5eb03e00fe2070644974e Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Fri, 9 Dec 2022 17:08:48 +0900
Subject: [PATCH] gn2bp: Set compile_multilibe: first to cc_object for
 gcc_processor.py

Test: ./update_results.sh, m cronet_aml_java
Change-Id: I8da6cf4f8bd215e854cd457ac438d020d5edce80
---
 tools/gn2bp/Android.bp.swp | 8 ++++----
 tools/gn2bp/gen_android_bp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 0b0ad9ee94..565c36d4ff 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -5698,7 +5698,7 @@ cc_object {
         "-E",
         "-P",
     ],
-    compile_multilib: "32",
+    compile_multilib: "first",
 }
 
 // GN: //build/android:build_config_gen
@@ -7899,7 +7899,7 @@ cc_object {
         "-E",
         "-P",
     ],
-    compile_multilib: "32",
+    compile_multilib: "first",
 }
 
 // GN: //components/cronet/android:integrated_mode_state
@@ -7965,7 +7965,7 @@ cc_object {
         "-E",
         "-P",
     ],
-    compile_multilib: "32",
+    compile_multilib: "first",
 }
 
 // GN: //components/cronet/android:load_states_list
@@ -9958,7 +9958,7 @@ cc_object {
         "-E",
         "-P",
     ],
-    compile_multilib: "32",
+    compile_multilib: "first",
 }
 
 // GN: //net/android:net_errors_java
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 46918c6b7e..499b6e3cce 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -663,7 +663,7 @@ def create_gcc_preprocess_modules(blueprint, target):
   # It seems this is because cc object is a module with per-architecture variants and genrule is a
   # module with default variant. For 64bit target, cc_object is built multiple times for 32/64bit
   # modes and genrule doesn't know which one to depend on.
-  preprocess_module.compile_multilib = 32
+  preprocess_module.compile_multilib = 'first'
   blueprint.add_module(preprocess_module)
 
   # Generates srcjar using soong_zip