Blissify Initial
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 382b68e..50b3672 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -1,6 +1,6 @@
bootstrap_go_package {
- name: "soong-lineage",
- pkgPath: "lineage/soong/android",
+ name: "soong-bliss",
+ pkgPath: "bliss/soong/android",
srcs: [
"android/config.go",
"android/variable.go",
@@ -8,8 +8,8 @@
}
bootstrap_go_package {
- name: "soong-lineage-generator",
- pkgPath: "lineage/soong/generator",
+ name: "soong-bliss-generator",
+ pkgPath: "bliss/soong/generator",
deps: [
"blueprint",
"blueprint-pathtools",
@@ -24,7 +24,7 @@
pluginFor: ["soong_build"],
}
-lineage_generator {
+bliss_generator {
name: "generated_kernel_includes",
// The headers make command
diff --git a/build/soong/android/config.go b/build/soong/android/config.go
index e926c9d..3b4d6d0 100644
--- a/build/soong/android/config.go
+++ b/build/soong/android/config.go
@@ -1,7 +1,7 @@
package android
-// Global config used by Lineage soong additions
-var LineageConfig = struct {
+// Global config used by Bliss soong additions
+var BlissConfig = struct {
// List of packages that are permitted
// for java source overlays.
JavaSourceOverlayModuleWhitelist []string
diff --git a/build/soong/generator/generator.go b/build/soong/generator/generator.go
index 7da1fde..ffaece3 100644
--- a/build/soong/generator/generator.go
+++ b/build/soong/generator/generator.go
@@ -29,7 +29,7 @@
)
func init() {
- android.RegisterModuleType("lineage_generator", GeneratorFactory)
+ android.RegisterModuleType("bliss_generator", GeneratorFactory)
pctx.HostBinToolVariable("sboxCmd", "sbox")
}
@@ -214,12 +214,12 @@
if depRoot == "" {
depRoot = ctx.ModuleDir()
} else {
- depRoot = lineageExpandVariables(ctx, depRoot)
+ depRoot = blissExpandVariables(ctx, depRoot)
}
// Glob dep_files property
for _, dep_file := range g.properties.Dep_files {
- dep_file = lineageExpandVariables(ctx, dep_file)
+ dep_file = blissExpandVariables(ctx, dep_file)
globPath := filepath.Join(depRoot, dep_file)
paths, err := ctx.GlobWithDeps(globPath, nil)
if err != nil {
@@ -231,7 +231,7 @@
}
}
- cmd := lineageExpandVariables(ctx, String(g.properties.Cmd))
+ cmd := blissExpandVariables(ctx, String(g.properties.Cmd))
rawCommand, err := android.Expand(cmd, func(name string) (string, error) {
switch name {
diff --git a/build/soong/generator/variables.go b/build/soong/generator/variables.go
index 8485f94..3e633ff 100644
--- a/build/soong/generator/variables.go
+++ b/build/soong/generator/variables.go
@@ -6,12 +6,12 @@
"android/soong/android"
)
-func lineageExpandVariables(ctx android.ModuleContext, in string) string {
- lineageVars := ctx.Config().VendorConfig("lineageVarsPlugin")
+func blissExpandVariables(ctx android.ModuleContext, in string) string {
+ blissVars := ctx.Config().VendorConfig("blissVarsPlugin")
out, err := android.Expand(in, func(name string) (string, error) {
- if lineageVars.IsSet(name) {
- return lineageVars.String(name), nil
+ if blissVars.IsSet(name) {
+ return blissVars.String(name), nil
}
// This variable is not for us, restore what the original
// variable string will have looked like for an Expand
diff --git a/build/soong/soong_config.mk b/build/soong/soong_config.mk
index f421c58..9b94482 100644
--- a/build/soong/soong_config.mk
+++ b/build/soong/soong_config.mk
@@ -1,7 +1,7 @@
add_json_str_omitempty = $(if $(strip $(2)),$(call add_json_str, $(1), $(2)))
add_json_val_default = $(call add_json_val, $(1), $(if $(strip $(2)), $(2), $(3)))
-_contents := $(_contents) "Lineage":{$(newline)
+_contents := $(_contents) "Bliss":{$(newline)
# See build/core/soong_config.mk for the add_json_* functions you can use here.
$(call add_json_str_omitempty, Additional_gralloc_10_usage_bits, $(TARGET_ADDITIONAL_GRALLOC_10_USAGE_BITS))