summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-10-05 15:47:25 +0100
committer Paul Duffin <paulduffin@google.com> 2022-10-06 21:32:01 +0100
commit1459deac793b2dd8b962e05b6aad75331a60876c (patch)
tree99ffbd30f1d5368e4464f94ff2f3f76e7d765241 /scripts/merge_json.py
parentddf000f42ca366d3bb24def6b07ed0b43e3d358d (diff)
Add CommonOs to Config.Targets
(cherry picked from commit de13a3a23264683e187983ff2d5199af5321caf2) Previously, CommonOs was not added to Config.Targets for the test which caused AndroidMk to crash when trying to determine if a target needed the 2ND_ prefix added to some make variables. Bug: 245956352 Test: m nothing Change-Id: Ie0e9e1fa88e2f96fd66b154da319b1839916e77c Merged-In: Ia815537ee5ce8e83df9a01c57250aa888453d138
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions