diff options
| author | Simon Shields <simon@lineageos.org> | 2017-08-23 12:05:33 +1000 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-08 22:28:30 +0200 |
| commit | ccfd6365018adcb91e25761f2314169152def410 (patch) | |
| tree | 8b3ef74daaa6aff6008914641364da1c006cf147 | |
| parent | 191bf4e250d097995a2d55e5ca464ffd022b5baa (diff) | |
soong: extend with lineage board flags
Includes the following commit:
Author: Simon Shields <simon@lineageos.org>
Date: Mon Sep 4 21:09:44 2017 +1000
soong: explicitly specify name of Lineage variables struct
Change-Id: Ic754b8a13658ddc40620f985581bd1754b780b15
Change-Id: If127c9da6b57340ae57e0cf725151cdcc3c82ef3
| -rw-r--r-- | android/Android.bp | 1 | ||||
| -rw-r--r-- | android/variable.go | 8 | ||||
| -rw-r--r-- | scripts/microfactory.bash | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/android/Android.bp b/android/Android.bp index 9712c46e3..e0664a13c 100644 --- a/android/Android.bp +++ b/android/Android.bp @@ -8,6 +8,7 @@ bootstrap_go_package { "soong-android-soongconfig", "soong-env", "soong-shared", + "soong-lineage", ], srcs: [ "androidmk.go", diff --git a/android/variable.go b/android/variable.go index 983c23567..51823407c 100644 --- a/android/variable.go +++ b/android/variable.go @@ -20,6 +20,8 @@ import ( "runtime" "strings" + "lineage/soong/android" + "github.com/google/blueprint/proptools" ) @@ -131,6 +133,9 @@ type variableProperties struct { Srcs []string `android:"arch_variant"` Exclude_srcs []string `android:"arch_variant"` } `android:"arch_variant"` + + // include Lineage variables + Lineage android.Product_variables } `android:"arch_variant"` } @@ -336,6 +341,9 @@ type productVariables struct { InstallExtraFlattenedApexes *bool `json:",omitempty"` BoardUsesRecoveryAsBoot *bool `json:",omitempty"` + + // include Lineage variables + Lineage android.ProductVariables } func boolPtr(v bool) *bool { diff --git a/scripts/microfactory.bash b/scripts/microfactory.bash index 4bb6058ab..b8bb81dbe 100644 --- 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 github.com/golang/protobuf=${TOP}/external/golang-protobuf" \ + EXTRA_ARGS="-pkg-path android/soong=${TOP}/build/soong -pkg-path lineage/soong=${TOP}/vendor/lineage/build/soong -pkg-path github.com/golang/protobuf=${TOP}/external/golang-protobuf" \ build_go $@ } |