aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-08-15 11:19:12 -0700
committerColin Cross <ccross@android.com>2018-08-16 16:13:58 -0700
commit3063b78ea57a4c206996332c3eb5cb79f65a0c92 (patch)
treea5caf341e2b5478c638010c87707165f9f988dc2 /android
parentb628ea532772ff33d2582cfa2e2fb28f23bf6462 (diff)
downloadbuild_soong-3063b78ea57a4c206996332c3eb5cb79f65a0c92.tar.gz
build_soong-3063b78ea57a4c206996332c3eb5cb79f65a0c92.tar.bz2
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 'android')
-rw-r--r--android/paths.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/android/paths.go b/android/paths.go
index c9e71503..e69fbe72 100644
--- a/android/paths.go
+++ b/android/paths.go
@@ -663,6 +663,11 @@ func (p OutputPath) withRel(rel string) OutputPath {
return p
}
+func (p OutputPath) WithoutRel() OutputPath {
+ p.basePath.rel = filepath.Base(p.basePath.path)
+ return p
+}
+
var _ Path = OutputPath{}
// PathForOutput joins the provided paths and returns an OutputPath that is