diff options
| -rw-r--r-- | android/namespace.go | 3 | ||||
| -rw-r--r-- | ui/build/dumpvars.go | 1 | ||||
| -rw-r--r-- | ui/build/paths/config.go | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/android/namespace.go b/android/namespace.go index d137636e2..ccda7c45a 100644 --- a/android/namespace.go +++ b/android/namespace.go @@ -132,6 +132,9 @@ func (r *NameResolver) addNamespace(namespace *Namespace) (err error) { return fmt.Errorf("a namespace must be the first module in the file") } } + if (namespace.exportToKati) { + r.rootNamespace.visibleNamespaces = append(r.rootNamespace.visibleNamespaces, namespace) + } r.sortedNamespaces.add(namespace) r.namespacesByDir.Store(namespace.Path, namespace) diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go index 54aeda082..42bcc2277 100644 --- a/ui/build/dumpvars.go +++ b/ui/build/dumpvars.go @@ -139,6 +139,7 @@ func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_ var BannerVars = []string{ "PLATFORM_VERSION_CODENAME", "PLATFORM_VERSION", + "ICE_VERSION", "TARGET_PRODUCT", "TARGET_BUILD_VARIANT", "TARGET_BUILD_TYPE", diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go index 5f8e313cb..ba9042953 100644 --- a/ui/build/paths/config.go +++ b/ui/build/paths/config.go @@ -102,6 +102,9 @@ var Configuration = map[string]PathConfig{ "tr": Allowed, "unzip": Allowed, "zip": Allowed, + "arm-linux-androideabi-as": Allowed, + "arm-linux-androideabi-ld": Allowed, + "arm-linux-androideabi-ld.bfd": Allowed, // Host toolchain is removed. In-tree toolchain should be used instead. // GCC also can't find cc1 with this implementation. |