diff options
| author | 2020-06-15 05:24:19 +0000 | |
|---|---|---|
| committer | 2020-06-25 12:42:07 +0000 | |
| commit | 40fd90ae523beb27d52093b9ca5ba9154a336859 (patch) | |
| tree | fa2d61d2c3ef4d90cdba9b3d4c92cf610521aa02 /sdk | |
| parent | 670ed3d97df4df8c7c24f3ee4a1c30341c1808b1 (diff) | |
Support multiple dists per Android.bp module, and dist output selection.
This CL adds "dists" to the base property struct to support multiple
dist file configurations, and generic tag support to dist tagged outputs
of modules.
Fixes: b/152834186
Test: soong tests and `m sdk dist`
Change-Id: I80c86bc9b7b09e671f640a4480c45d438bdd9a2a
Signed-off-by: Jingwen Chen <jingwen@google.com>
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/sdk.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sdk/sdk.go b/sdk/sdk.go index cb5a6053d..b9b8199d3 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -291,7 +291,7 @@ func (s *sdk) AndroidMkEntries() []android.AndroidMkEntries { return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "FAKE", OutputFile: s.snapshotFile, - DistFile: s.snapshotFile, + DistFiles: android.MakeDefaultDistFiles(s.snapshotFile.Path()), Include: "$(BUILD_PHONY_PACKAGE)", ExtraFooters: []android.AndroidMkExtraFootersFunc{ func(w io.Writer, name, prefix, moduleDir string, entries *android.AndroidMkEntries) { |