summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-07-27 16:16:54 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2022-08-19 15:19:32 +0000
commit04beaabb467962b9f7aecfb766e1e98aa178fc92 (patch)
tree60c46fc239f44e1d020f0a3189b37d07647bad9e /scripts/merge_json.py
parent710a9edf21d7307bfd644b86920d1b59418e123d (diff)
Push Hidden_api inside HiddenAPIFlagFileProperties
All usages of HiddenAPIFlagFileProperties use it as the type of a Hidden_api field. This change pushes the field inside the struct and just embeds the struct inside the structs that need it making it simpler and more consistent with how the HiddenApiPackageProperties struct is used. This is extracted as a separate change as while the change is simple it does affect a lot of lines. Keeping it separate makes it easier to review the changes. Bug: 240406019 Test: packages/modules/common/build/mainline_modules_sdks.sh # Ran the previous command with and without this change to make # sure that this change does not change the sdk snapshot # contents. Change-Id: I664453029574ef68dc5712f7bf137a1a6e78e864 (cherry picked from commit 9b61abbd840503dd9bd2eebf7fee8be627be4eb5) Merged-In: I664453029574ef68dc5712f7bf137a1a6e78e864
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions