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

Add support for LOCAL_ARM_MODE in androidmk

Browse Source 
Uses a hack to nest it inside of an arch-arm block.

Change-Id: Id36c7398e4a91fc8dd69fa7d1f78c9d30258281a
This commit is contained in:
Tim Kilbourn
2015-03-19 17:25:29 -07:00
parent 6b29069d42
commit 3f0c9ede6d
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
androidmk/cmd/androidmk/android.go
View File

@@ -23,6 +23,7 @@ var stringProperties = map[string]string{
"LOCAL_CXX_STL": "stl", "LOCAL_CXX_STL": "stl",
"LOCAL_STRIP_MODULE": "strip", "LOCAL_STRIP_MODULE": "strip",
"LOCAL_MULTILIB": "compile_multilib", "LOCAL_MULTILIB": "compile_multilib",
"LOCAL_ARM_MODE_HACK": "instruction_set",
} }
var listProperties = map[string]string{ var listProperties = map[string]string{

6
androidmk/cmd/androidmk/androidmk.go
View File

@@ -246,6 +246,12 @@ func handleAssignment(file *bpFile, assignment mkparser.Assignment, c *condition
} else { } else {
if name == "LOCAL_PATH" { if name == "LOCAL_PATH" {
// Nothing to do, except maybe avoid the "./" in paths? // Nothing to do, except maybe avoid the "./" in paths?
} else if name == "LOCAL_ARM_MODE" {
// This is a hack to get the LOCAL_ARM_MODE value inside
// of an arch: { arm: {} } block.
armModeAssign := assignment
armModeAssign.Name = mkparser.SimpleMakeString("LOCAL_ARM_MODE_HACK_arm", assignment.Name.Pos)
handleAssignment(file, armModeAssign, c)
} else if strings.HasPrefix(name, "LOCAL_") { } else if strings.HasPrefix(name, "LOCAL_") {
//setVariable(file, assignment, name, bpparser.String, true) //setVariable(file, assignment, name, bpparser.String, true)
switch name { switch name {