soong: Meow

Signed-off-by: Herobuxx <[email protected]>
TheCatGang · Jun 22, 2020 · cafd2ba · cafd2ba
1 parent 3b55d67
commit cafd2ba
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 42 deletions.
diff --git a/Android.bp b/Android.bp
@@ -38,7 +38,7 @@ bootstrap_go_package {
         "soong",
         "soong-env",
         "soong-shared",
-        "soong-gzosp",
+        "soong-cat",
     ],
     srcs: [
         "android/androidmk.go",

diff --git a/android/config.go b/android/config.go
@@ -883,7 +883,7 @@ func (c *deviceConfig) DeviceKernelHeaderDirs() []string {
 }
 
 func (c *deviceConfig) SpecificCameraParametersLibrary() string {
-	return String(c.config.productVariables.Gzosp.Specific_camera_parameter_library)
+	return String(c.config.productVariables.Cat.Specific_camera_parameter_library)
 }
 
 func (c *deviceConfig) NativeCoverageEnabled() bool {

diff --git a/android/variable.go b/android/variable.go
@@ -20,7 +20,7 @@ import (
 	"runtime"
 	"strings"
 
-	"gzosp/soong/android"
+	"cat/soong/android"
 
 	"github.com/google/blueprint/proptools"
 )
@@ -127,8 +127,8 @@ type variableProperties struct {
 			Srcs         []string
 		}
 
-		// include Gzosp variables
-		Gzosp android.Product_variables
+		// include Cat variables
+		Cat android.Product_variables
 	} `android:"arch_variant"`
 }
 
@@ -293,8 +293,8 @@ type productVariables struct {
 
 	TargetFSConfigGen []string `json:",omitempty"`
 
-	// include Gzosp variables
-	Gzosp android.ProductVariables
+	// include Cat variables
+	Cat android.ProductVariables
 }
 
 func boolPtr(v bool) *bool {

diff --git a/scripts/microfactory.bash b/scripts/microfactory.bash
@@ -59,7 +59,7 @@ function soong_build_go
     BUILDDIR=$(getoutdir) \
       SRCDIR=${TOP} \
       BLUEPRINTDIR=${TOP}/build/blueprint \
-      EXTRA_ARGS="-pkg-path android/soong=${TOP}/build/soong -pkg-path gzosp/soong=${TOP}/vendor/gzosp/build/soong -pkg-path github.com/golang/protobuf=${TOP}/external/golang-protobuf" \
+      EXTRA_ARGS="-pkg-path android/soong=${TOP}/build/soong -pkg-path cat/soong=${TOP}/vendor/cat/build/soong -pkg-path github.com/golang/protobuf=${TOP}/external/golang-protobuf" \
       build_go $@
 }
 

diff --git a/ui/build/dumpvars.go b/ui/build/dumpvars.go
@@ -125,7 +125,7 @@ func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_
 var BannerVars = []string{
 	"PLATFORM_VERSION_CODENAME",
 	"PLATFORM_VERSION",
-	"GZOSP_VERSION",
+	"CAT_VERSION",
 	"TARGET_PRODUCT",
 	"TARGET_BUILD_VARIANT",
 	"TARGET_BUILD_TYPE",
@@ -157,41 +157,10 @@ func Banner(make_vars map[string]string) string {
 	b := &bytes.Buffer{}
 
 	fmt.Fprintln(b, "=============================================================")
-	fmt.Fprintln(b, "  @@@@@@@@  @@@@@@@@   @@@@@@    @@@@@@   @@@@@@@   ")
-	fmt.Fprintln(b, " @@@@@@@@@  @@@@@@@@  @@@@@@@@  @@@@@@@   @@@@@@@@  ")
-	fmt.Fprintln(b, " !@@             @@!  @@!  @@@  !@@       @@!  @@@  ")
-	fmt.Fprintln(b, " !@!            !@!   !@!  @!@  !@!       !@!  @!@  ")
-	fmt.Fprintln(b, " !@! @!@!@     @!!    @!@  !@!  !!@@!!    @!@@!@!   ")
-	fmt.Fprintln(b, " !!! !!@!!    !!!     !@!  !!!   !!@!!!   !!@!!!    ")
-	fmt.Fprintln(b, " :!!   !!:   !!:      !!:  !!!       !:!  !!:       ")
-	fmt.Fprintln(b, " :!:   !::  :!:       :!:  !:!      !:!   :!:       ")
-	fmt.Fprintln(b, "  ::: ::::   :: ::::  ::::: ::  :::: ::    ::       ")
-	fmt.Fprintln(b, "  :: :: :   : :: : :   : :  :   :: : :     :        ")
-	fmt.Fprintln(b, "=============================================================")
-	fmt.Fprintf(b, "%s=%s\n", "HOST_ARCH", make_vars["HOST_ARCH"])
-	fmt.Fprintf(b, "%s=%s\n", "HOST_2ND_ARCH", make_vars["HOST_2ND_ARCH"])
-	fmt.Fprintf(b, "%s=%s\n", "HOST_OS", make_vars["HOST_OS"])
-	fmt.Fprintf(b, "%s=%s\n", "HOST_OS_EXTRA", make_vars["HOST_OS_EXTRA"])
-	fmt.Fprintf(b, "%s=%s\n", "HOST_CROSS_OS", make_vars["HOST_CROSS_OS"])
-	fmt.Fprintf(b, "%s=%s\n", "HOST_CROSS_ARCH", make_vars["HOST_CROSS_ARCH"])
-	fmt.Fprintf(b, "%s=%s\n", "HOST_CROSS_2ND_ARCH", make_vars["HOST_CROSS_2ND_ARCH"])
-	fmt.Fprintln(b, "=============================================================")
-	fmt.Fprintf(b, "%s=%s\n", "GZOSP_VERSION", make_vars["GZOSP_VERSION"])
+	fmt.Fprintf(b, "%s=%s\n", "CAT_VERSION", make_vars["CAT_VERSION"])
 	fmt.Fprintf(b, "%s=%s\n", "BUILD_ID", make_vars["BUILD_ID"])
 	fmt.Fprintf(b, "%s=%s\n", "OUT_DIR", make_vars["OUT_DIR"])
-	fmt.Fprintln(b, "=============================================================")
-	fmt.Fprintf(b, "%s=%s\n", "PLATFORM_VERSION_CODENAME", make_vars["PLATFORM_VERSION_CODENAME"])
-	fmt.Fprintf(b, "%s=%s\n", "PLATFORM_VERSION", make_vars["PLATFORM_VERSION"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_PRODUCT", make_vars["TARGET_PRODUCT"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_BUILD_VARIANT", make_vars["TARGET_BUILD_VARIANT"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_BUILD_TYPE", make_vars["TARGET_BUILD_TYPE"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_GCC_VERSION", make_vars["TARGET_GCC_VERSION"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_ARCH", make_vars["TARGET_ARCH"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_ARCH_VARIANT", make_vars["TARGET_ARCH_VARIANT"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_CPU_VARIANT", make_vars["TARGET_CPU_VARIANT"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_2ND_ARCH", make_vars["TARGET_2ND_ARCH"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_2ND_ARCH_VARIANT", make_vars["TARGET_2ND_ARCH_VARIANT"])
-	fmt.Fprintf(b, "%s=%s\n", "TARGET_2ND_CPU_VARIANT", make_vars["TARGET_2ND_CPU_VARIANT"])
+	fmt.Fprintf(b, "%s=%s\n", "PRODUCT_SOONG_NAMESPACES", make_vars["PRODUCT_SOONG_NAMESPACES"])
 	fmt.Fprintln(b, "=============================================================")
 
 	return b.String()