Merge the tests into a single target

Author: Bencodes

test/rules/android_binary/r8_integration/BUILD

@@ -62,18 +62,3 @@ script_test(
     ],
 )
 
-script_test(
-    name = "r8_java_resources_integration_test",
-    size = "enormous",
-    srcs = ["r8_java_resources_integration_test.sh"],
-    additional_env_inherit = ["ANDROID_HOME"],
-    bazel_binaries = bazel_binaries,
-    bazel_version = bazel_binaries.versions.current,
-    tags = ["manual"],
-    timeout = "eternal",
-    deps = [
-        ":r8_integration_helper",
-        "//test/bashunit",
-        "@rules_shell//shell/runfiles",
-    ],
-)

test/rules/android_binary/r8_integration/r8_desugaring_integration_test.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Integration tests for R8 desugaring with and without --desugar_java8_libs.
+# Integration tests for R8 desugaring and Java resource preservation.
 
 # --- begin runfiles.bash initialization v2 ---
 # Copy-pasted from the Bazel Bash runfiles library v2.
@@ -62,4 +62,22 @@ function test_desugaring_disabled() {
   fi
 }
 
+# Test: with --desugar_java8_libs enabled, Java resources from dependency JARs
+# must be present in the final APK.
+function test_java_resources_preserved_with_desugaring() {
+  build_app --desugar_java8_libs
+
+  apk_contains_file 'com/test/data/metadata.txt' || \
+    fail "Java resource 'com/test/data/metadata.txt' not found in APK. " \
+         "DexReducer likely stripped non-.dex entries and java_resource_jar was not set."
+}
+
+# Test: without desugaring, Java resources should also be preserved.
+function test_java_resources_preserved_without_desugaring() {
+  build_app --nodesugar_java8_libs
+
+  apk_contains_file 'com/test/data/metadata.txt' || \
+    fail "Java resource 'com/test/data/metadata.txt' not found in APK even without desugaring."
+}
+
 run_suite "R8 desugaring integration tests"

test/rules/android_binary/r8_integration/r8_integration_helper.sh

@@ -41,9 +41,8 @@ function get_rules_android_path() {
   if [[ -z "${module_bazel}" || ! -f "${module_bazel}" ]]; then
     fail "Failed to locate rules_android MODULE.bazel"
   fi
-  local real_path
-  real_path="$(python3 -c "import os; print(os.path.realpath('${module_bazel}'))")"
-  dirname "${real_path}"
+  # pwd -P resolves symlinks (POSIX built-in, no python3 dependency).
+  (cd "$(dirname "${module_bazel}")" && pwd -P)
 }
 
 # set_up is called before each test by bashunit. We only initialize the