diff options
author | Simon Shields <simon@lineageos.org> | 2017-08-23 12:05:33 +1000 |
---|---|---|
committer | Rashed Abdel-Tawab <rashed@linux.com> | 2017-12-05 16:06:13 -0800 |
commit | 0c77f66b8b821b8f603a3c35f21ef960f53c5b78 (patch) | |
tree | 40e978c09e0358ecfcc5aaff53e7863e342af2e0 | |
parent | 08734bbeaea207b87b03db02ac10adca417b7623 (diff) | |
download | build_soong-0c77f66b8b821b8f603a3c35f21ef960f53c5b78.tar.gz build_soong-0c77f66b8b821b8f603a3c35f21ef960f53c5b78.tar.bz2 build_soong-0c77f66b8b821b8f603a3c35f21ef960f53c5b78.zip |
soong: extend with lineage board flags
Change-Id: If127c9da6b57340ae57e0cf725151cdcc3c82ef3
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | android/variable.go | 8 | ||||
-rw-r--r-- | cmd/microfactory/microfactory.bash | 1 | ||||
-rw-r--r-- | root.bp | 1 |
4 files changed, 11 insertions, 0 deletions
@@ -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 @@ -6,6 +6,7 @@ build = [ subdirs = [ "build/soong", + "vendor/lineage/build/soong", ] optional_subdirs = [ |