diff options
author | Simon Shields <simon@lineageos.org> | 2017-08-23 12:05:33 +1000 |
---|---|---|
committer | Rashed Abdel-Tawab <rashed@linux.com> | 2017-10-28 14:13:26 -0700 |
commit | 769d138874511a1f1720772a1af52d8fb32546b9 (patch) | |
tree | 6bc7bdb7565856003d73db0f5e351631398b1cb2 | |
parent | b8dd0989e7c06a8d37f64cd7f8794a0f4d39dce8 (diff) | |
download | build_soong-769d138874511a1f1720772a1af52d8fb32546b9.tar.gz build_soong-769d138874511a1f1720772a1af52d8fb32546b9.tar.bz2 build_soong-769d138874511a1f1720772a1af52d8fb32546b9.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
@@ -44,6 +44,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 1ab3801f..331d4f39 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"` } @@ -162,6 +167,9 @@ type productVariables struct { BtConfigIncludeDir *string `json:",omitempty"` Override_rs_driver *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 7489fe39..6a33da30 100644 --- a/cmd/microfactory/microfactory.bash +++ b/cmd/microfactory/microfactory.bash @@ -80,6 +80,7 @@ function build_go ${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 = [ |