diff options
| -rw-r--r-- | aconfig/aconfig_declarations.go | 16 | ||||
| -rw-r--r-- | aconfig/init.go | 2 | ||||
| -rw-r--r-- | ui/terminal/format.go | 9 | ||||
| -rw-r--r-- | ui/terminal/status.go | 5 |
4 files changed, 17 insertions, 15 deletions
diff --git a/aconfig/aconfig_declarations.go b/aconfig/aconfig_declarations.go index 80d36afd5..14438c82f 100644 --- a/aconfig/aconfig_declarations.go +++ b/aconfig/aconfig_declarations.go @@ -229,10 +229,16 @@ func mergeAconfigFiles(ctx android.ModuleContext, inputs android.Paths) android. } func SetAconfigFileMkEntries(m *android.ModuleBase, entries *android.AndroidMkEntries, aconfigFiles map[string]android.Paths) { - if m.InstallInVendor() { - entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles["vendor"]) - } else { - // TODO(b/311155208): The container here should be system. - entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[""]) + // TODO(b/311155208): The default container here should be system. + container := "" + + if m.SocSpecific() { + container = "vendor" + } else if m.ProductSpecific() { + container = "product" + } else if m.SystemExtSpecific() { + container = "system_ext" } + + entries.SetPaths("LOCAL_ACONFIG_FILES", aconfigFiles[container]) } diff --git a/aconfig/init.go b/aconfig/init.go index 52d075572..c1b923b82 100644 --- a/aconfig/init.go +++ b/aconfig/init.go @@ -78,7 +78,7 @@ var ( blueprint.RuleParams{ Command: `rm -rf ${out}.tmp` + `&& for cache in ${cache_files}; do ` + - ` if [[ -n "$$(${aconfig} dump --cache $$cache --filter=is_exported:true --format='{fully_qualified_name}')" ]]; then ` + + ` if [ -n "$$(${aconfig} dump --cache $$cache --filter=is_exported:true --format='{fully_qualified_name}')" ]; then ` + ` ${aconfig} create-java-lib --cache $$cache --mode=exported --out ${out}.tmp; ` + ` fi ` + `done` + diff --git a/ui/terminal/format.go b/ui/terminal/format.go index 539102390..241a1ddf7 100644 --- a/ui/terminal/format.go +++ b/ui/terminal/format.go @@ -25,7 +25,6 @@ import ( type formatter struct { format string quiet bool - smart bool start time.Time } @@ -33,11 +32,10 @@ type formatter struct { // the terminal in a format similar to Ninja. // format takes nearly all the same options as NINJA_STATUS. // %c is currently unsupported. -func newFormatter(format string, quiet bool, smart bool) formatter { +func newFormatter(format string, quiet bool) formatter { return formatter{ format: format, quiet: quiet, - smart: smart, start: time.Now(), } } @@ -63,9 +61,8 @@ func remainingTimeString(t time.Time) string { func (s formatter) progress(counts status.Counts) string { if s.format == "" { output := fmt.Sprintf("[%3d%% %d/%d", 100*counts.FinishedActions/counts.TotalActions, counts.FinishedActions, counts.TotalActions) - // Not to break parsing logic in the build bot - // TODO(b/313981966): make buildbot more flexible for output format - if s.smart && !counts.EstimatedTime.IsZero() { + + if !counts.EstimatedTime.IsZero() { output += fmt.Sprintf(" %s remaining", remainingTimeString(counts.EstimatedTime)) } output += "] " diff --git a/ui/terminal/status.go b/ui/terminal/status.go index 810e3c93d..2ad174fee 100644 --- a/ui/terminal/status.go +++ b/ui/terminal/status.go @@ -27,10 +27,9 @@ import ( // statusFormat takes nearly all the same options as NINJA_STATUS. // %c is currently unsupported. func NewStatusOutput(w io.Writer, statusFormat string, forceSimpleOutput, quietBuild, forceKeepANSI bool) status.StatusOutput { - useSmartStatus := !forceSimpleOutput && isSmartTerminal(w) - formatter := newFormatter(statusFormat, quietBuild, useSmartStatus) + formatter := newFormatter(statusFormat, quietBuild) - if useSmartStatus { + if !forceSimpleOutput && isSmartTerminal(w) { return NewSmartStatusOutput(w, formatter) } else { return NewSimpleStatusOutput(w, formatter, forceKeepANSI) |