tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support the 'host' conditional in androidbp

Browse source 
Change-Id: I01eaa1ad2e05aaf8cbf00286d7272d0f45bb18aa
This commit is contained in:
Dan Willemsen 2015-06-24 15:50:07 -07:00
parent 3a4045d3b1
commit 0a544695e9
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
androidbp/cmd/androidbp.go
View file

@ -271,7 +271,7 @@ func (w *androidMkWriter) parsePropsAndWriteModule(module *Module) {
} else if "target" == prop.Name.Name { } else if "target" == prop.Name.Name {
props := w.lookupMap(prop.Value) props := w.lookupMap(prop.Value)
standardProps = append(standardProps, translateTargetConditionals(props, disabledBuilds, module.isHostRule)...) standardProps = append(standardProps, translateTargetConditionals(props, disabledBuilds, module.isHostRule)...)
} else if "host_supported" == prop.Name.Name { } else if _, ok := ignoredProperties[prop.Name.Name]; ok {
} else { } else {
standardProps = append(standardProps, fmt.Sprintf("# ERROR: Unsupported property %s", prop.Name.Name)) standardProps = append(standardProps, fmt.Sprintf("# ERROR: Unsupported property %s", prop.Name.Name))
} }

5
androidbp/cmd/soong.go
View file

@ -71,6 +71,10 @@ var rewriteProperties = map[string]struct {
"suffix": {"LOCAL_MODULE_STEM", prependLocalModule}, "suffix": {"LOCAL_MODULE_STEM", prependLocalModule},
} }
var ignoredProperties = map[string]bool{
"host_supported": true,
}
var moduleTypeToRule = map[string]string{ var moduleTypeToRule = map[string]string{
"cc_library_shared": "BUILD_SHARED_LIBRARY", "cc_library_shared": "BUILD_SHARED_LIBRARY",
"cc_library_static": "BUILD_STATIC_LIBRARY", "cc_library_static": "BUILD_STATIC_LIBRARY",
@ -97,6 +101,7 @@ var suffixProperties = map[string]map[string]string{
} }
var hostScopedPropertyConditionals = map[string]string{ var hostScopedPropertyConditionals = map[string]string{
"host": "",
"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)",