summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author William Escande <wescande@google.com> 2025-02-25 15:38:46 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-02-25 15:38:46 -0800
commit2f305791cce0fc5b72fec80cce4e7d01d19eb6b0 (patch)
treecd08fd9da9a2fedc44a7162b95d33b228d6c1a97
parent780678c45671b445fa8a8193011bcdaec2c89338 (diff)
Revert "Prevent flag optimization in the app"
This reverts commit 780678c45671b445fa8a8193011bcdaec2c89338. Reason for revert: Temporary fix is not needed anymore Now that the test is re-building the source, it should be possible to optimize the app again. Relevant changes that allows this: https://r.android.com/3501909 Bug: 395691070 Bug: 383863941 Change-Id: I3d339647ea47852c1eac43adc9683f589f252815 Test: atest BluetoothJavaUnitTests Test: will be verified by atp run on release target Flag: Exempt - mainline and app optimization
-rw-r--r--android/app/Android.bp4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/app/Android.bp b/android/app/Android.bp
index 1a1b0cd950..81f630b436 100644
--- a/android/app/Android.bp
+++ b/android/app/Android.bp
@@ -221,7 +221,7 @@ android_library {
"bluetooth_flags_java_lib",
"error_prone_annotations",
"framework-annotations-lib",
- "framework-bluetooth-pre-jarjar",
+ "framework-bluetooth.impl",
"framework-configinfrastructure.stubs.module_lib",
"framework-connectivity-t.stubs.module_lib",
"framework-connectivity.stubs.module_lib",
@@ -341,7 +341,7 @@ android_app {
enabled: true,
shrink: true,
optimize: false,
- // ignore_warnings: false, // TODO: b/191783947 -- re-activate error
+ ignore_warnings: false,
proguard_flags_files: ["proguard.flags"],
},