gn2bp: Only compile x64 for host machines
* The generated desc_*.json files except the compiling(not target) cpu architecture to be x64. which
was an issue because Soong tries to compile for both x32 and x64.
Test: mma
Change-Id: I6be5ed045a25e4020e69bf0157f919f43e68e2c0
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index b5eae77..ca8741f 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -663,6 +663,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -2654,6 +2655,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -3415,6 +3417,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -4237,6 +4240,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -5273,6 +5277,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -5437,6 +5442,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -6151,6 +6157,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -6294,6 +6301,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -6425,6 +6433,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -6556,6 +6565,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -10358,6 +10368,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -10399,6 +10410,7 @@
cflags: [
"-UANDROID",
],
+ compile_multilib: "64",
},
},
}
@@ -17908,6 +17920,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -18070,6 +18083,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -18232,6 +18246,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -18394,6 +18409,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -18556,6 +18572,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -18718,6 +18735,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -18880,6 +18898,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -19044,6 +19063,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -19206,6 +19226,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -19372,6 +19393,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -19534,6 +19556,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -19696,6 +19719,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -19858,6 +19882,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -20020,6 +20045,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -20182,6 +20208,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -20344,6 +20371,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -20506,6 +20534,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -20668,6 +20697,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -20830,6 +20860,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -20992,6 +21023,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -21156,6 +21188,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -21324,6 +21357,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -21492,6 +21526,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -21660,6 +21695,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -21828,6 +21864,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -21996,6 +22033,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -22164,6 +22202,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -22326,6 +22365,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -22488,6 +22528,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -22656,6 +22697,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -22820,6 +22862,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -22982,6 +23025,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -23148,6 +23192,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -23322,6 +23367,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -23484,6 +23530,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -23646,6 +23693,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -23808,6 +23856,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -23974,6 +24023,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -24146,6 +24196,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -24332,6 +24383,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -24494,6 +24546,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -24668,6 +24721,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -24830,6 +24884,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -25008,6 +25063,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -25178,6 +25234,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -25340,6 +25397,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -25502,6 +25560,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -26484,6 +26543,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -26800,6 +26860,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -28081,6 +28142,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -28677,6 +28739,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
@@ -28885,6 +28948,7 @@
local_include_dirs: [
"third_party/libevent/linux/",
],
+ compile_multilib: "64",
},
},
}
@@ -29650,6 +29714,7 @@
"-fstack-protector",
"-msse3",
],
+ compile_multilib: "64",
},
},
}
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index a0e719d..c339664 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -327,6 +327,9 @@
self.generated_headers = set()
self.export_generated_headers = set()
self.ldflags = set()
+ self.compile_multilib = None
+ if name == 'host':
+ self.compile_multilib = '64'
def to_string(self, output):
nested_out = []
@@ -347,6 +350,9 @@
self._output_field(nested_out, 'ldflags')
if nested_out:
+ # This is added here to make sure it doesn't add a `host` arch-specific module just for
+ # `compile_multilib` flag.
+ self._output_field(nested_out, 'compile_multilib')
output.append(' %s: {' % self.name)
for line in nested_out:
output.append(' %s' % line)