diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-05-07 14:19:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-07 14:19:52 +0000 |
| commit | da2bba1d710d4e84a075a9e14ddded4bf53f401f (patch) | |
| tree | 9b650eddcf5d110eb8283a967e82d98b8b86f106 /java/java.go | |
| parent | 3277c39c6b4b27ec20508e999adce345ae2b1839 (diff) | |
| parent | 988708ce75c4e152a6b1f1a02fb096928e5d87c1 (diff) | |
Merge "Allow module types to generate resources"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 47dd95724..b9c06a8e9 100644 --- a/java/java.go +++ b/java/java.go @@ -340,6 +340,9 @@ type Module struct { // list of additional targets for checkbuild additionalCheckedModules android.Paths + // Extra files generated by the module type to be added as java resources. + extraResources android.Paths + hiddenAPI dexpreopter } @@ -1113,6 +1116,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path dirArgs, dirDeps := ResourceDirsToJarArgs(ctx, j.properties.Java_resource_dirs, j.properties.Exclude_java_resource_dirs, j.properties.Exclude_java_resources) fileArgs, fileDeps := ResourceFilesToJarArgs(ctx, j.properties.Java_resources, j.properties.Exclude_java_resources) + extraArgs, extraDeps := resourcePathsToJarArgs(j.extraResources), j.extraResources var resArgs []string var resDeps android.Paths @@ -1123,6 +1127,9 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path resArgs = append(resArgs, fileArgs...) resDeps = append(resDeps, fileDeps...) + resArgs = append(resArgs, extraArgs...) + resDeps = append(resDeps, extraDeps...) + if Bool(j.properties.Include_srcs) { srcArgs, srcDeps := SourceFilesToJarArgs(ctx, j.properties.Srcs, j.properties.Exclude_srcs) resArgs = append(resArgs, srcArgs...) |