From 2a4067259799fadd6d5a289347e50fe81caa5f97 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 13 Dec 2019 16:23:11 -0800
Subject: [PATCH] Initialize common_proguard_flags for each module

Id938aa35e87c9c69769a3184dfea06fd02299688 removed the initial
assignment to common_proguard_flags, which both makes it grow as
each module is parsed and also turns it into a lazily evaluated
variable.  That causes the flags passed to R8 to be the flags
computed for the current module multiplied by the number of previously
parsed modules.

Fixes: 146150575
Test: m checkbuild
Change-Id: I87c9625496f482896be6867124f2f12ff662cd57
---
 core/java.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/java.mk b/core/java.mk
index 907f2dcde..a041321b6 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -413,6 +413,7 @@ legacy_proguard_lib_deps := $(my_proguard_sdk_raise) \
 legacy_proguard_flags += -printmapping $(proguard_dictionary)
 legacy_proguard_flags += -printconfiguration $(proguard_configuration)
 
+common_proguard_flags :=
 common_proguard_flag_files := $(BUILD_SYSTEM)/proguard.flags
 ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),)
 common_proguard_flags += -dontshrink # don't shrink tests by default