diff options
| author | 2024-06-17 15:03:33 -0700 | |
|---|---|---|
| committer | 2024-06-27 11:01:56 -0700 | |
| commit | ba48366969a55dc2a28ce278a01d6d8ecef4adc2 (patch) | |
| tree | 0713d876245802461b2dd519f31f8bbda447a052 /androidmk | |
| parent | 38a97b2c47a447f0fd17efbfbeabc631eb752b75 (diff) | |
Update selects_test for selects with deferred expressions
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I18257ff586fb31d4e0b012a249726a925832cdac
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/androidmk/android.go | 3 | ||||
| -rw-r--r-- | androidmk/androidmk/androidmk.go | 2 | ||||
| -rw-r--r-- | androidmk/androidmk/values.go | 6 |
3 files changed, 3 insertions, 8 deletions
diff --git a/androidmk/androidmk/android.go b/androidmk/androidmk/android.go index 8a8bb2eaa..570f36c16 100644 --- a/androidmk/androidmk/android.go +++ b/androidmk/androidmk/android.go @@ -341,9 +341,6 @@ func classifyLocalOrGlobalPath(value bpparser.Expression) (string, bpparser.Expr firstOperand := v.Args[0] secondOperand := v.Args[1] - if firstOperand.Type() != bpparser.StringType { - return "global", value, nil - } if _, ok := firstOperand.(*bpparser.Operator); ok { return "global", value, nil diff --git a/androidmk/androidmk/androidmk.go b/androidmk/androidmk/androidmk.go index 2e8810fe8..6fb20dcc1 100644 --- a/androidmk/androidmk/androidmk.go +++ b/androidmk/androidmk/androidmk.go @@ -493,7 +493,6 @@ func setVariable(file *bpFile, plusequals bool, prefix, name string, value bppar Name: name, NamePos: pos, Value: value, - OrigValue: value, EqualsPos: pos, Assigner: "+=", } @@ -506,7 +505,6 @@ func setVariable(file *bpFile, plusequals bool, prefix, name string, value bppar Name: name, NamePos: pos, Value: value, - OrigValue: value, EqualsPos: pos, Assigner: "=", } diff --git a/androidmk/androidmk/values.go b/androidmk/androidmk/values.go index 9618142fa..701c708e2 100644 --- a/androidmk/androidmk/values.go +++ b/androidmk/androidmk/values.go @@ -81,7 +81,7 @@ func makeToStringExpression(ms *mkparser.MakeString, file *bpFile) (bpparser.Exp } tmp := &bpparser.Variable{ Name: name, - Value: &bpparser.String{}, + Type_: bpparser.StringType, } if tmp.Name == "TOP" { @@ -150,7 +150,7 @@ func makeToListExpression(ms *mkparser.MakeString, file *bpFile) (bpparser.Expre } listOfListValues = append(listOfListValues, &bpparser.Variable{ Name: name, - Value: &bpparser.List{}, + Type_: bpparser.ListType, }) listValue = &bpparser.List{} } @@ -215,7 +215,7 @@ func makeToBoolExpression(ms *mkparser.MakeString, file *bpFile) (bpparser.Expre } return &bpparser.Variable{ Name: name, - Value: &bpparser.Bool{}, + Type_: bpparser.BoolType, }, nil } else { return nil, fmt.Errorf("non-const bool expression %s", ms.Dump()) |