diff options
| author | 2019-07-16 01:36:26 -0700 | |
|---|---|---|
| committer | 2019-07-16 01:36:26 -0700 | |
| commit | a0b5690cb885cb87d571dc13864712a027f6b4c2 (patch) | |
| tree | 050300c639ee1b1ed2814f2b47330b8ab1931a63 /java/java.go | |
| parent | b942bd8030c83d4e1edd40e41d703e93c0bbae1e (diff) | |
| parent | 7610ba915c3a5105eedb8668e8db544f4fb0bbfd (diff) | |
Merge changes I2c00af07,I2f49fa7d into qt-dev
am: 7610ba915c
Change-Id: I17ca6fb856a9c04cac0651934eb19b7939c6b00e
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/java/java.go b/java/java.go index ff6bbacc5..bf738c4d3 100644 --- a/java/java.go +++ b/java/java.go @@ -1270,11 +1270,9 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path return } - if !ctx.Config().UnbundledBuild() { - // Hidden API CSV generation and dex encoding - dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile, - j.deviceProperties.UncompressDex) - } + // Hidden API CSV generation and dex encoding + dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile, + j.deviceProperties.UncompressDex) // merge dex jar with resources if necessary if j.resourceJar != nil { |