diff options
| author | Colin Cross <ccross@android.com> | 2018-08-13 10:28:18 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-08-13 17:29:58 +0000 |
| commit | bd1cef56181f3d5a7f60144fe770b11fed6114ed (patch) | |
| tree | 3ef5993e341a45e0c3d4264714995ea8e908798e | |
| parent | 0c3b508d2b8135accc2662a0601bc44f821b60da (diff) | |
| download | android_build_soong-bd1cef56181f3d5a7f60144fe770b11fed6114ed.tar.gz android_build_soong-bd1cef56181f3d5a7f60144fe770b11fed6114ed.tar.bz2 android_build_soong-bd1cef56181f3d5a7f60144fe770b11fed6114ed.zip | |
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
| -rw-r--r-- | java/dex.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/dex.go b/java/dex.go index db240fc5..8363a7db 100644 --- a/java/dex.go +++ b/java/dex.go @@ -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...) |