summaryrefslogtreecommitdiff
path: root/scripts/jsonmodify.py
diff options
context:
space:
mode:
authorRoland Levillain <rpl@google.com>2019-07-29 16:22:59 +0100
committerRoland Levillain <rpl@google.com>2019-07-29 19:21:27 +0100
commitf89cd0949c573b86a12eeaf0a799f5faf8e1040a (patch)
treebb80d7ff9f3d212c99e95cef58dbdeb59fb0dcb0 /scripts/jsonmodify.py
parentc89fe6253f67810e4340c595e63fb25c0ff7d09b (diff)
Handle `test_per_src` modules as indirect dependencies in APEXes.
In `apex.apexBundle.GenerateAndroidBuildActions`, we used to pass the "all tests" ("") module as `module` for all `apexFile` objects created from a test module using `test_per_src: true`. An immediate issue of this situation was that the "" module is hidden from Make, which made all the generated `apexFile` objects hidden from Make too. This would break the construction of flattened APEXes, as they rely on Make logic to install their files. Instead of collecting `test_per_src` test variations' output files in `cc.Module.GenerateAndroidBuildActions` and using them in `apex.apexBundle.GenerateAndroidBuildActions` as part of handling the "" variation as a direct dependency of an `apexBundle`, process them as indirect dependencies (and do nothing for the "" variation direct dependency). Adjust the indirect dependency logic in `apex.apexBundle.GenerateAndroidBuildActions` to allow not only shared/runtime native libraries as indirect dependencies of an `apexBundle`, but also `test_per_src` tests. Test: m (`apex/apex_test.go` amended) Bug: 129534335 Change-Id: I845e0f0dd3a98d61d0b7118c5eaf61f3e5335724
Diffstat (limited to 'scripts/jsonmodify.py')
0 files changed, 0 insertions, 0 deletions