diff options
| author | Colin Cross <ccross@android.com> | 2018-08-15 11:19:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-08-16 16:13:58 -0700 |
| commit | 3063b78ea57a4c206996332c3eb5cb79f65a0c92 (patch) | |
| tree | a5caf341e2b5478c638010c87707165f9f988dc2 /java/dex.go | |
| parent | b628ea532772ff33d2582cfa2e2fb28f23bf6462 (diff) | |
| download | android_build_soong-3063b78ea57a4c206996332c3eb5cb79f65a0c92.tar.gz android_build_soong-3063b78ea57a4c206996332c3eb5cb79f65a0c92.tar.bz2 android_build_soong-3063b78ea57a4c206996332c3eb5cb79f65a0c92.zip | |
Make :module provide the output file for java modules
Make :module on a java_library provide the output file, which is
normally the implementation jar. For java_library modules with
installable: true or compile_dex: true this will be the dexjar
instead. For android_app modules this will be the apk.
Bug: 80144045
Test: no change to out/soong/build.ninja
Change-Id: I739674aee60a38bfccb859369e4414b46f293d82
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/dex.go b/java/dex.go index 8363a7db..d0ca06e4 100644 --- a/java/dex.go +++ b/java/dex.go @@ -140,7 +140,7 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F } func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, - classesJar android.Path, jarName string) android.Path { + classesJar android.Path, jarName string) android.ModuleOutPath { useR8 := Bool(j.deviceProperties.Optimize.Enabled) |