Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd1cef56 authored by Colin Cross's avatar Colin Cross
Browse files

Add proguard_flags_files to r8 command line 

We were not passing the proguard_flags_files files as -include
arguments to R8.

Bug: 112462307
Test: m checkbuild
Change-Id: I8f3b10fc338aa4b15c0fb220ee2891efbb0b020f
parent 0c3b508d

java/dex.go

+2 −0
Original line number Diff line number Diff line
@@ -111,6 +111,8 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F 
	flagFiles = append(flagFiles, j.extraProguardFlagFiles...)

	// TODO(ccross): static android library proguard files



	flagFiles = append(flagFiles, android.PathsForModuleSrc(ctx, j.deviceProperties.Optimize.Proguard_flags_files)...)



	r8Flags = append(r8Flags, android.JoinWithPrefix(flagFiles.Strings(), "-include "))

	r8Deps = append(r8Deps, flagFiles...)