soong: extend with lineage board flags

Change-Id: If127c9da6b57340ae57e0cf725151cdcc3c82ef3

4 files changed, 11 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 82be0fa6..6907d91d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -33,6 +33,7 @@ bootstrap_go_package {
         "blueprint-bootstrap",
         "soong",
         "soong-env",
+        "soong-lineage",
     ],
     srcs: [
         "android/androidmk.go",
diff --git a/android/variable.go b/android/variable.go
index 77bdda2a..594f393e 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -20,6 +20,8 @@ import (
 	"runtime"
 	"strings"
 
+	"lineage/soong/android"
+
 	"github.com/google/blueprint/proptools"
 )
 
@@ -94,6 +96,9 @@ type variableProperties struct {
 		Pdk struct {
 			Enabled *bool
 		}
+
+		// include Lineage variables
+		*android.Product_variables
 	} `android:"arch_variant"`
 }
 
@@ -167,6 +172,9 @@ type productVariables struct {
 	Override_rs_driver *string `json:",omitempty"`
 
 	DeviceKernelHeaders []string `json:",omitempty"`
+
+	// include Lineage variables
+	*android.ProductVariables
 }
 
 func boolPtr(v bool) *bool {
diff --git a/cmd/microfactory/microfactory.bash b/cmd/microfactory/microfactory.bash
index aae67408..57a0400a 100644
--- a/cmd/microfactory/microfactory.bash
+++ b/cmd/microfactory/microfactory.bash
@@ -84,6 +84,7 @@ function build_go
     rm -f "${out_dir}/.$1.trace"
     ${mf_cmd} -s "${mf_src}" -b "${mf_bin}" \
             -pkg-path "android/soong=${TOP}/build/soong" -trimpath "${TOP}/build/soong" \
+            -pkg-path "lineage/soong=${TOP}/vendor/lineage/build/soong" \
             -o "${built_bin}" $2
 
     if [ $from_src -eq 1 ]; then
diff --git a/root.bp b/root.bp
index 08f2ff88..9fc3cd2a 100644
--- a/root.bp
+++ b/root.bp
@@ -6,6 +6,7 @@ build = [
 
 subdirs = [
     "build/soong",
+    "vendor/lineage/build/soong",
 ]
 
 optional_subdirs = [