StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

androidbp: Fix conditional spacing

Browse Source 
In make, conditionals are required to have a space in between the text
and the opening parenthesis.

Change-Id: I7e60e36982ec1d99acc66d0ffb4cff507e6a040d
This commit is contained in:
Dan Willemsen
2015-06-22 16:26:36 -07:00
parent d7b11dd232
commit 499c094c09
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
androidbp/cmd/soong.go
View File

@@ -98,36 +98,36 @@ var suffixProperties = map[string]map[string]string{
var hostScopedPropertyConditionals = map[string]string{ var hostScopedPropertyConditionals = map[string]string{
"darwin": "ifeq ($(HOST_OS), darwin)", "darwin": "ifeq ($(HOST_OS), darwin)",
"not_darwin": "ifneq($(HOST_OS), darwin)", "not_darwin": "ifneq ($(HOST_OS), darwin)",
"windows": "ifeq ($(HOST_OS), windows)", "windows": "ifeq ($(HOST_OS), windows)",
"not_windows": "ifneq($(HOST_OS), windows)", "not_windows": "ifneq ($(HOST_OS), windows)",
"linux": "ifeq ($(HOST_OS), linux)", "linux": "ifeq ($(HOST_OS), linux)",
"not_linux": "ifneq($(HOST_OS), linux)", "not_linux": "ifneq ($(HOST_OS), linux)",
} }
// TODO: host target? // TODO: host target?
var targetScopedPropertyConditionals = map[string]string{ var targetScopedPropertyConditionals = map[string]string{
"android": "", "android": "",
"android32": "ifneq($(TARGET_IS_64_BIT), true)", "android32": "ifneq ($(TARGET_IS_64_BIT), true)",
"not_android32": "ifeq($(TARGET_IS_64_BIT), true)", "not_android32": "ifeq ($(TARGET_IS_64_BIT), true)",
"android64": "ifeq($(TARGET_IS_64_BIT), true)", "android64": "ifeq ($(TARGET_IS_64_BIT), true)",
"not_android64": "ifneq($(TARGET_IS_64_BIT), true)", "not_android64": "ifneq ($(TARGET_IS_64_BIT), true)",
} }
var disabledHostConditionals = map[string]string{ var disabledHostConditionals = map[string]string{
"darwin": "ifneq ($(HOST_OS), darwin)", "darwin": "ifneq ($(HOST_OS), darwin)",
"not_darwin": "ifeq($(HOST_OS), darwin)", "not_darwin": "ifeq ($(HOST_OS), darwin)",
"windows": "ifneq ($(HOST_OS), windows)", "windows": "ifneq ($(HOST_OS), windows)",
"not_windows": "ifeq($(HOST_OS), windows)", "not_windows": "ifeq ($(HOST_OS), windows)",
"linux": "ifneq ($(HOST_OS), linux)", "linux": "ifneq ($(HOST_OS), linux)",
"not_linux": "ifeq($(HOST_OS), linux)", "not_linux": "ifeq ($(HOST_OS), linux)",
} }
var disabledTargetConditionals = map[string]string{ var disabledTargetConditionals = map[string]string{
"android32": "ifeq($(TARGET_IS_64_BIT), true)", "android32": "ifeq ($(TARGET_IS_64_BIT), true)",
"not_android32": "ifeq($(TARGET_IS_64_BIT), false)", "not_android32": "ifeq ($(TARGET_IS_64_BIT), false)",
"android64": "ifeq($(TARGET_IS_64_BIT), false)", "android64": "ifeq ($(TARGET_IS_64_BIT), false)",
"not_android64": "ifeq($(TARGET_IS_64_BIT), true)", "not_android64": "ifeq ($(TARGET_IS_64_BIT), true)",
} }
var targetToHostModuleRule = map[string]string{ var targetToHostModuleRule = map[string]string{