diff options
| author | 2017-11-22 16:19:37 -0800 | |
|---|---|---|
| committer | 2017-11-29 05:05:07 +0000 | |
| commit | 3bc7ffa59b8277b3a36eb9e16192583b3b9a93ea (patch) | |
| tree | 1a768f402d17a3181a18177e17935dbd1d3c60b2 /java/java.go | |
| parent | 0875c52de753b858b74a9ac285626536bee9cb57 (diff) | |
Replace aapt support with aapt2
Use aapt2 instead of aapt to compile Android app resources.
Also generate all files into srcjars instead of individual
sources.
Test: m checkbuild
Change-Id: I5a67991a0daf0017e8159b46fcff7d5564a91468
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/java/java.go b/java/java.go index 417cf7418..0a3b9b40b 100644 --- a/java/java.go +++ b/java/java.go @@ -204,10 +204,6 @@ type Module struct { logtagsSrcs android.Paths - // jars containing source files that should be included in the javac command line, - // for example R.java generated by aapt for android apps - ExtraSrcJars android.Paths - // installed file for binary dependency installFile android.Path } @@ -487,7 +483,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { if ctx.ModuleName() == "framework" { // framework.jar has a one-off dependency on the R.java and Manifest.java files // generated by framework-res.apk - // TODO(ccross): aapt java files should go in a src jar + deps.srcJars = append(deps.srcJars, dep.(*AndroidApp).aaptSrcJar) } case kotlinStdlibTag: deps.kotlinStdlib = dep.HeaderJars() @@ -555,7 +551,7 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB return flags } -func (j *Module) compile(ctx android.ModuleContext) { +func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path) { j.exportAidlIncludeDirs = android.PathsForModuleSrc(ctx, j.deviceProperties.Aidl.Export_include_dirs) @@ -574,7 +570,7 @@ func (j *Module) compile(ctx android.ModuleContext) { srcJars := srcFiles.FilterByExt(".srcjar") srcJars = append(srcJars, deps.srcJars...) - srcJars = append(srcJars, j.ExtraSrcJars...) + srcJars = append(srcJars, extraSrcJars...) var jars android.Paths |