diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-11-19 09:33:29 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-11-19 15:26:14 -0800 |
| commit | 569edc5f66dc5d5080da34d19ef40e00cddff2e6 (patch) | |
| tree | bf01fbd9e323b57ced77ad78c6ff4bd5c21e0025 /cc/androidmk.go | |
| parent | bba551c1faa41025e2e76230b258f94d042b99d9 (diff) | |
| download | build_soong-569edc5f66dc5d5080da34d19ef40e00cddff2e6.tar.gz build_soong-569edc5f66dc5d5080da34d19ef40e00cddff2e6.tar.bz2 build_soong-569edc5f66dc5d5080da34d19ef40e00cddff2e6.zip | |
Add dist support to Soong
When dist'ing a library or binary that has use_version_lib set, always
distribute the stamped version, even for the device.
Test: m test_build_version_test dist
Change-Id: I2995ec516b1d182ce18f099aeaa4d186ffbcf01f
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 5e389739..f5e04bb0 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -151,6 +151,7 @@ func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.An ret.Class = "HEADER_LIBRARIES" } + ret.DistFile = library.distFile ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { library.androidMkWriteExportedFlags(w) fmt.Fprintln(w, "LOCAL_ADDITIONAL_DEPENDENCIES := ") @@ -194,6 +195,7 @@ func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.Andr ctx.subAndroidMk(ret, binary.baseInstaller) ret.Class = "EXECUTABLES" + ret.DistFile = binary.distFile ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { fmt.Fprintln(w, "LOCAL_SOONG_UNSTRIPPED_BINARY :=", binary.unstrippedOutputFile.String()) if len(binary.symlinks) > 0 { |