diff options
| author | 2024-03-07 00:50:53 +0000 | |
|---|---|---|
| committer | 2024-03-07 00:50:53 +0000 | |
| commit | a7ee3e04825947b0bb4e0eb0fa122f8c9664abb4 (patch) | |
| tree | ea593f6ca1c222bfd2550ee7c104e232f9d6ea57 /java/app_test.go | |
| parent | eefca7373c1cefc2ee14a3b6a86db7eeefcddfbe (diff) | |
| parent | 1d3f590346ed67b77d623192d5c43a8c19e2ca38 (diff) | |
Merge "Reverse order of transitive R.jar classpath entries" into main
Diffstat (limited to 'java/app_test.go')
| -rw-r--r-- | java/app_test.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/app_test.go b/java/app_test.go index 28bea0a2b..5d7b048b3 100644 --- a/java/app_test.go +++ b/java/app_test.go @@ -948,10 +948,10 @@ func TestAndroidResourceProcessor(t *testing.T) { directSrcJars: nil, directClasspath: []string{ "out/soong/.intermediates/default/java/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar", - "out/soong/.intermediates/transitive_import/android_common/busybox/R.jar", - "out/soong/.intermediates/transitive_import_dep/android_common/busybox/R.jar", - "out/soong/.intermediates/transitive/android_common/busybox/R.jar", "out/soong/.intermediates/direct/android_common/busybox/R.jar", + "out/soong/.intermediates/transitive/android_common/busybox/R.jar", + "out/soong/.intermediates/transitive_import_dep/android_common/busybox/R.jar", + "out/soong/.intermediates/transitive_import/android_common/busybox/R.jar", "out/soong/.intermediates/transitive/android_common/turbine-combined/transitive.jar", "out/soong/.intermediates/transitive_import/android_common/aar/classes-combined.jar", }, @@ -981,9 +981,9 @@ func TestAndroidResourceProcessor(t *testing.T) { sharedSrcJars: nil, sharedClasspath: []string{ "out/soong/.intermediates/default/java/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar", + "out/soong/.intermediates/shared/android_common/busybox/R.jar", "out/soong/.intermediates/shared_transitive_static/android_common/busybox/R.jar", "out/soong/.intermediates/shared_transitive_shared/android_common/busybox/R.jar", - "out/soong/.intermediates/shared/android_common/busybox/R.jar", "out/soong/.intermediates/shared_transitive_shared/android_common/turbine-combined/shared_transitive_shared.jar", "out/soong/.intermediates/shared_transitive_static/android_common/turbine-combined/shared_transitive_static.jar", }, @@ -1094,9 +1094,9 @@ func TestAndroidResourceProcessor(t *testing.T) { directSrcJars: nil, directClasspath: []string{ "out/soong/.intermediates/default/java/android_stubs_current/android_common/turbine-combined/android_stubs_current.jar", - "out/soong/.intermediates/transitive_import/android_common/busybox/R.jar", - "out/soong/.intermediates/transitive_import_dep/android_common/busybox/R.jar", "out/soong/.intermediates/direct/android_common/busybox/R.jar", + "out/soong/.intermediates/transitive_import_dep/android_common/busybox/R.jar", + "out/soong/.intermediates/transitive_import/android_common/busybox/R.jar", "out/soong/.intermediates/transitive/android_common/turbine-combined/transitive.jar", "out/soong/.intermediates/transitive_import/android_common/aar/classes-combined.jar", }, |