aboutsummaryrefslogtreecommitdiffstats
path: root/androidmk
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2019-01-08 15:39:37 +0000
committerAnton Hansson <hansson@google.com>2019-01-09 10:50:57 +0000
commit1976a25692e5c9c19f4dcd86de38d7da9279e3b9 (patch)
tree498a2ce29102f5127b73717cadfd05adb8761ad3 /androidmk
parent1f8076b42dfd99d01b720c027bafd7f671b1d12a (diff)
downloadbuild_soong-1976a25692e5c9c19f4dcd86de38d7da9279e3b9.tar.gz
build_soong-1976a25692e5c9c19f4dcd86de38d7da9279e3b9.tar.bz2
build_soong-1976a25692e5c9c19f4dcd86de38d7da9279e3b9.zip
Make androidmk translate LOCAL_32_BIT_ONLY
Translate LOCAL_32_BIT_ONLY := true to compile_multilib: "32". Test: androidmk frameworks/av/services/mediadrm/Android.mk Change-Id: I9f73f5fdfc67738286844ff42b39ee54403fe649
Diffstat (limited to 'androidmk')
-rw-r--r--androidmk/cmd/androidmk/android.go15
1 files changed, 15 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go
index d16ac934..c8228ede 100644
--- a/androidmk/cmd/androidmk/android.go
+++ b/androidmk/cmd/androidmk/android.go
@@ -42,6 +42,7 @@ type variableAssignmentContext struct {
var rewriteProperties = map[string](func(variableAssignmentContext) error){
// custom functions
+ "LOCAL_32_BIT_ONLY": local32BitOnly,
"LOCAL_AIDL_INCLUDES": localAidlIncludes,
"LOCAL_C_INCLUDES": localIncludeDirs,
"LOCAL_EXPORT_C_INCLUDE_DIRS": exportIncludeDirs,
@@ -360,6 +361,20 @@ func exportIncludeDirs(ctx variableAssignmentContext) error {
return splitAndAssign(ctx, classifyLocalOrGlobalPath, map[string]string{"global": "export_include_dirs", "local": "export_include_dirs"})
}
+func local32BitOnly(ctx variableAssignmentContext) error {
+ val, err := makeVariableToBlueprint(ctx.file, ctx.mkvalue, bpparser.BoolType)
+ if err != nil {
+ return err
+ }
+ if val.(*bpparser.Bool).Value {
+ thirtyTwo := &bpparser.String{
+ Value: "32",
+ }
+ setVariable(ctx.file, false, ctx.prefix, "compile_multilib", thirtyTwo, true)
+ }
+ return nil
+}
+
func localAidlIncludes(ctx variableAssignmentContext) error {
return splitAndAssign(ctx, classifyLocalOrGlobalPath, map[string]string{"global": "aidl.include_dirs", "local": "aidl.local_include_dirs"})
}