diff options
| -rw-r--r-- | android/namespace.go | 3 | ||||
| -rw-r--r-- | android/variable.go | 1 | ||||
| -rw-r--r-- | ui/build/cleanbuild.go | 5 | ||||
| -rw-r--r-- | ui/build/dumpvars.go | 1 | ||||
| -rw-r--r-- | ui/build/paths/config.go | 3 |
5 files changed, 12 insertions, 1 deletions
diff --git a/android/namespace.go b/android/namespace.go index fc7bc290f..85f276a63 100644 --- a/android/namespace.go +++ b/android/namespace.go @@ -136,6 +136,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/android/variable.go b/android/variable.go index 7f8daf0f8..bbd3bf9db 100644 --- a/android/variable.go +++ b/android/variable.go @@ -134,6 +134,7 @@ type variableProperties struct { Eng struct { Cflags []string Cppflags []string + Init_rc []string Lto struct { Never *bool } diff --git a/ui/build/cleanbuild.go b/ui/build/cleanbuild.go index 1c80cff31..df1470a4a 100644 --- a/ui/build/cleanbuild.go +++ b/ui/build/cleanbuild.go @@ -154,11 +154,13 @@ func installClean(ctx Context, config Config) { hostCommonOut("obj/PACKAGING"), productOut("*.img"), productOut("*.zip"), + productOut("*.zip.sha256sum"), productOut("android-info.txt"), productOut("misc_info.txt"), productOut("apex"), productOut("kernel"), productOut("kernel-*"), + productOut("recovery_kernel"), productOut("data"), productOut("skin"), productOut("obj/NOTICE_FILES"), @@ -187,7 +189,8 @@ func installClean(ctx Context, config Config) { productOut("odm_dlkm"), productOut("sysloader"), productOut("testcases"), - productOut("symbols")) + productOut("symbols"), + productOut("install")) } // Since products and build variants (unfortunately) shared the same diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go index cc796ce3f..581f8d329 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", "PRODUCT_INCLUDE_TAGS", "TARGET_PRODUCT", "TARGET_BUILD_VARIANT", diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go index 1197c4816..28ad04f72 100644 --- a/ui/build/paths/config.go +++ b/ui/build/paths/config.go @@ -80,6 +80,9 @@ var Configuration = map[string]PathConfig{ "aarch64-linux-android-nm": Log, "aarch64-linux-android-objcopy": Log, "aarch64-linux-android-objdump": Log, + "arm-linux-androideabi-as": Allowed, + "arm-linux-androideabi-ld": Allowed, + "arm-linux-androideabi-ld.bfd": Allowed, "bash": Allowed, "dd": Allowed, "diff": Allowed, |