diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/aapt2.go | 4 | ||||
| -rw-r--r-- | java/app_test.go | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/java/aapt2.go b/java/aapt2.go index cebd6d157..84e3729fe 100644 --- a/java/aapt2.go +++ b/java/aapt2.go @@ -16,6 +16,7 @@ package java import ( "path/filepath" + "sort" "strconv" "strings" @@ -85,6 +86,9 @@ func aapt2Compile(ctx android.ModuleContext, dir android.Path, paths android.Pat }) } + sort.Slice(ret, func(i, j int) bool { + return ret[i].String() < ret[j].String() + }) return ret } diff --git a/java/app_test.go b/java/app_test.go index 35230d45f..73ac3f78e 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -17,6 +17,7 @@ package java import ( "android/soong/android" "reflect" + "sort" "testing" ) @@ -79,7 +80,11 @@ func TestApp(t *testing.T) { t.Errorf("expected aapt2 compile inputs expected:\n %#v\n got:\n %#v", resourceFiles, compile.Inputs.Strings()) } - expectedLinkImplicits = append(expectedLinkImplicits, compile.Outputs.Strings()...) + + compiledResourceOutputs := compile.Outputs.Strings() + sort.Strings(compiledResourceOutputs) + + expectedLinkImplicits = append(expectedLinkImplicits, compiledResourceOutputs...) list := foo.Output("aapt2/res.list") expectedLinkImplicits = append(expectedLinkImplicits, list.Output.String()) |