summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-07-27 16:27:42 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2022-08-21 12:18:06 +0000
commitb5e3c9802a43893259e1f56997f985a64ff7762a (patch)
tree7d2b30e8c246f4a92c3a6cca04cf95cb3935773c /scripts/merge_json.py
parent067e12f46a51b500b61c1afd1d84c8f2e107f8df (diff)
Add hidden API properties to java_sdk_library modules
Previously, hidden API properties were only allowed on bootclasspath_fragment and platform_bootclasspath module types. This change allows them to be specified on java_sdk_library modules too. It involves the following changes: 1. Add the properties to the java.Module. 2. Populate and provide a HiddenAPIPropertyInfo struct from java_sdk_library modules. 3. Modify bootclasspath_fragment to merge information gathered from its content libraries as if it was specified on the fragment itself. Bug: 240406019 Test: m nothing 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: I64eb71c2039ddc14cf380689d0cec7ec221f5b88 (cherry picked from commit 3f1ae0b55acd7e727c6227c3ab3e4f34e885e478) Merged-In: I64eb71c2039ddc14cf380689d0cec7ec221f5b88
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions