summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-10-04 20:01:04 +0100
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2022-10-07 10:40:15 +0000
commit308fa1e56f0e9e4d6a1a56c1b6569cc24606c2fb (patch)
treed680436f01fe3dbdb06ac51834a878006b2123ce /scripts/merge_json.py
parent1456504fbaf84b6fcd8f423b21fdf50ccf9bede6 (diff)
Prevent bootImageVariant.licenseMetadataFile being set twice
Previously, in a build containing source and prebuilt art bootclasspath_fragments, the bootImageVariant.licenseMetadataFile was set twice with the source always being set after the prebuilt and so winning. This change only sets bootImageVariant.licenseMetadataFile for the active module so it will use the prebuilt's license file if that is preferred. Bug: 245956352 Test: m nothing Change-Id: I948c7e5123169452f67c85ad98c4bbdb90a5d2de (cherry picked from commit 20d90e3e51ae85abb8c4133b19197201cae84ed1) Merged-In: I948c7e5123169452f67c85ad98c4bbdb90a5d2de
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions