gn2bp: toolchain propery is always present
No need to default to anything.
Test: //components/cronet/android:cronet
Change-Id: I93ea5173c4d9059c4c824347a380542eeda97292
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index b3cda41..17722db 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -223,10 +223,7 @@
return target.type == 'group' and re.match('.*_java$', target.name)
def _get_arch(self, toolchain):
- if toolchain is None:
- # TODO: throw an exception instead of defaulting to x86_64.
- return 'x86_64'
- elif toolchain == '//build/toolchain/android:android_clang_x86':
+ if toolchain == '//build/toolchain/android:android_clang_x86':
return 'x86'
elif toolchain == '//build/toolchain/android:android_clang_x64':
return 'x86_64'
@@ -259,7 +256,7 @@
target_name = label_without_toolchain(gn_target_name)
target = self.all_targets.get(target_name)
desc = gn_desc[gn_target_name]
- arch = self._get_arch(desc.get('toolchain', None))
+ arch = self._get_arch(desc['toolchain'])
if target is None:
target = GnParser.Target(target_name, desc['type'])
self.all_targets[target_name] = target