diff options
| author | Simon Shields <simon@lineageos.org> | 2017-08-23 12:05:33 +1000 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2019-12-11 19:03:32 +0200 |
| commit | 5191af565c2e81cece5dc846c608210cb9af9efc (patch) | |
| tree | b858d4e3eb617bd0df60145d369366826f1481b5 | |
| parent | 627fae94f946428bc406737aa37eadf16f7dd855 (diff) | |
| download | build_soong-5191af565c2e81cece5dc846c608210cb9af9efc.tar.gz build_soong-5191af565c2e81cece5dc846c608210cb9af9efc.tar.bz2 build_soong-5191af565c2e81cece5dc846c608210cb9af9efc.zip | |
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.bp | 1 | ||||
| -rw-r--r-- | android/variable.go | 8 | ||||
| -rw-r--r-- | scripts/microfactory.bash | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -37,6 +37,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 e643c0eb..a30a423e 100644 --- a/android/variable.go +++ b/android/variable.go @@ -20,6 +20,8 @@ import ( "runtime" "strings" + "lineage/soong/android" + "github.com/google/blueprint/proptools" ) @@ -124,6 +126,9 @@ type variableProperties struct { Static_libs []string Srcs []string } + + // include Lineage variables + Lineage android.Product_variables } `android:"arch_variant"` } @@ -287,6 +292,9 @@ type productVariables struct { ProductHiddenAPIStubsTest []string `json:",omitempty"` TargetFSConfigGen []string `json:",omitempty"` + + // include Lineage variables + Lineage android.ProductVariables } func boolPtr(v bool) *bool { diff --git a/scripts/microfactory.bash b/scripts/microfactory.bash index 4bb6058a..b8bb81db 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 $@ } |