gn2bp: Merge cc_genrule cmd
Test: ./update_results.sh
Test: m cronet_aml_components_cronet_android_cronet
Test: m cronet_aml_java
Change-Id: Ib9efad99e87acf47ba88a31bac86dcabd2a40c4f
diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py
index 2c55cf9..9d732e5 100644
--- a/tools/gn2bp/gn_utils.py
+++ b/tools/gn2bp/gn_utils.py
@@ -369,13 +369,13 @@
target.type = 'java_group'
elif target.type in ['action', 'action_foreach']:
self.actions[gn_target_name] = target
- target.inputs.update(desc.get('inputs', []))
+ target.arch[arch].inputs.update(desc.get('inputs', []))
target.arch[arch].sources.update(desc.get('sources', []))
outs = [re.sub('^//out/.+?/gen/', '', x) for x in desc['outputs']]
- target.outputs.update(outs)
- target.script = desc['script']
- target.args = desc['args']
- target.response_file_contents = self._get_response_file_contents(desc)
+ target.arch[arch].outputs.update(outs)
+ target.arch[arch].script = desc['script']
+ target.arch[arch].args = desc['args']
+ target.arch[arch].response_file_contents = self._get_response_file_contents(desc)
elif target.type == 'copy':
# TODO: copy rules are not currently implemented.
self.actions[gn_target_name] = target