From 7d911b52688cc214b13e4282698827ea4b48fba8 Mon Sep 17 00:00:00 2001 From: Googler Date: Mon, 14 Aug 2023 01:57:36 -0700 Subject: [PATCH] Add --no_proguard_location_reference unconditionally. Bazel support was removed in unknown commit. RELNOTES[INC]: --no_proguard_location_reference is now added unconditionally to the command line of aapt2. PiperOrigin-RevId: 556709548 Change-Id: I1ec8db2b566cb99f118614ed75b76b8b6f703105 --- .../google/devtools/build/android/aapt2/ResourceLinker.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java index 3507d8340cb22f..11095aec99758b 100644 --- a/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java +++ b/src/tools/android/java/com/google/devtools/build/android/aapt2/ResourceLinker.java @@ -476,11 +476,7 @@ private ProtoApk linkProtoApk( .add("--java", javaSourceDirectory) .add("--proguard", proguardConfig) .add("--proguard-main-dex", mainDexProguard) - // By default, exclude the file path location comments, since the paths - // include temporary directory names, which otherwise cause - // nondeterministic build output. - .when(!includeProguardLocationReferences) - .thenAdd("--no-proguard-location-reference") + .add("--no-proguard-location-reference") .when(conditionalKeepRules) .thenAdd("--proguard-conditional-keep-rules") .add("-o", linked)