summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Jiyong Park <jiyong@google.com> 2019-08-19 14:56:02 +0900
committer Jiyong Park <jiyong@google.com> 2019-08-29 15:54:17 +0900
commit4c61d9745723e2d50e6d763a3d5509d0813bf1a6 (patch)
tree615548634d4b5c23e2ccc902ffd386a1bcf8271c /java/java.go
parentf11508a94fbaa4565b0ce1c53d0dbad90f7bf83e (diff)
Prepare to be able to put framework-res in srcs
This change introduces two changes required to put framework-res explicitly in srcs property, without relying on the build system to specially add framework-res as a dependency to framework-minus-apex, etc. 1) R.java and Manifest.java generated from aapt were packaged to the file R.jar directly under the gen directory. With this change, the file becomes android/R.srcjar under the gen directory. 2) android_app module now overrides OutputFileProducer interface so that it can recognize "{.aapt.srcjar}" tag to reference the generated srcjar file. Being able to put framework-res in srcs allows us to pass all the source files (both in the source tree and the ones generates) via a filegroup. Previously, the source files could only be passed via the java_library module type. This caused a circular dependency problem when the java library was used as an input (src_libs) of the droiddoc module. Using filegroup eliminates the circular dependency. Bug: 70046217 Test: m Merged-In: I9ab6116bcc6fa3da60933d427575463b05ae69b4 (cherry picked from commit 94f37f33ed9dc5c7ad6ff901f5aa613970513ead) Change-Id: I9ab6116bcc6fa3da60933d427575463b05ae69b4
Diffstat (limited to 'java/java.go')
0 files changed, 0 insertions, 0 deletions