gn2bp: Set compile_multilibe: first to cc_object for gcc_processor.py
Test: ./update_results.sh, m cronet_aml_java
Change-Id: I8da6cf4f8bd215e854cd457ac438d020d5edce80
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 0b0ad9e..565c36d 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -5698,7 +5698,7 @@
"-E",
"-P",
],
- compile_multilib: "32",
+ compile_multilib: "first",
}
// GN: //build/android:build_config_gen
@@ -7899,7 +7899,7 @@
"-E",
"-P",
],
- compile_multilib: "32",
+ compile_multilib: "first",
}
// GN: //components/cronet/android:integrated_mode_state
@@ -7965,7 +7965,7 @@
"-E",
"-P",
],
- compile_multilib: "32",
+ compile_multilib: "first",
}
// GN: //components/cronet/android:load_states_list
@@ -9958,7 +9958,7 @@
"-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 46918c6..499b6e3 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -663,7 +663,7 @@
# 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