diff options
| author | Tobias Thierer <tobiast@google.com> | 2019-08-01 14:05:11 +0100 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2019-08-01 15:13:51 +0100 |
| commit | 79eea269ce9db7740ed6fce44c475b2eaf5b1bdf (patch) | |
| tree | e72bfe0e2d392e09a96fd2e759fde4be10a90b6f /annotations/generate_annotated_java_files.py | |
| parent | d5f94dfec8482453df15db2f63676d19bad01198 (diff) | |
libcore: java_resource_dirs -> java_resources
Before this CL, core resources were included via java_resource_dirs. This makes
it difficult to add additional individual files / filegroups from elsewhere
(needed for bug 135431432).
This CL uses java_resources instead. Because the luni/ resources are currently
mixed-in with .java source files, whereas ojluni/ resources are in their own
resources/ subdirectory, this CL lists the luni resource paths explicitly but
uses a glob to collect the ojluni/ resources. I have a separate draft CL to
move the luni resources to a resources/ subdirectory, but am not yet sure
whether I should upload it for review.
Bug: 135431432
Test: Checked that the following md5sums don't change as part of this CL:
make core-all core-oj core-libart && md5sum \
out/soong/.intermediates/libcore/core-oj/android_common/withres/core-oj.jar \
out/soong/.intermediates/libcore/core-libart/android_common/withres/core-libart.jar
Change-Id: Ie9f0fcc63c8c2db12011323c2fa549b13f1383a1
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions