diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-03-26 02:30:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-26 02:30:35 +0000 |
| commit | f7e7776079565a9894f7b7bca16ecae4db2a6874 (patch) | |
| tree | 2dd3e6c425549bce9f884c2fff3f01689b9d2c73 | |
| parent | 078188774f88ff13d3c02a1a46dc5f9034f27aff (diff) | |
| parent | 3fe7b7f66efb4de8fee61b19d53c91118dde2d33 (diff) | |
| download | soong-f7e7776079565a9894f7b7bca16ecae4db2a6874.tar.gz | |
Merge "Disable "__builtin_func" when converting mk to bp" into main
| -rw-r--r-- | androidmk/androidmk/androidmk_test.go | 16 | ||||
| -rw-r--r-- | androidmk/parser/scope.go | 6 |
2 files changed, 18 insertions, 4 deletions
diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go index 460f1ffac..1dd479ca5 100644 --- a/androidmk/androidmk/androidmk_test.go +++ b/androidmk/androidmk/androidmk_test.go @@ -511,6 +511,22 @@ endif # b==false `, }, { + // Unsupported function case because that doesn't work in bp + desc: "error for unsupported functions", + in: ` +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(filter-out filter-out-file.java ,$(call all-java-files-under, src)) +LOCAL_PACKAGE_NAME := foo +include $(BUILD_PACKAGE) +`, + expected: ` +android_app { + name: "foo", + srcs: ["UNSUPPORTED FUNCTION:filter-out filter-out-file.java src/**/*.java"], +} + `, + }, + { desc: "ignore all-makefiles-under", in: ` include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/androidmk/parser/scope.go b/androidmk/parser/scope.go index 8111c89e1..e1a523a6b 100644 --- a/androidmk/parser/scope.go +++ b/androidmk/parser/scope.go @@ -14,9 +14,7 @@ package parser -import ( - "strings" -) +import "strings" type Scope interface { Get(name string) string @@ -88,7 +86,7 @@ func (v Variable) EvalFunction(scope Scope) ([]string, bool) { if fname == "call" { return scope.Call(argVals[0], argVals[1:]), true } else { - return []string{"__builtin_func:" + fname + " " + strings.Join(argVals, " ")}, true + return []string{"UNSUPPORTED FUNCTION:" + fname + " " + strings.Join(argVals, " ")}, true } } } |