diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-17 03:11:37 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-17 03:11:37 +0000 |
| commit | 8fa121dc8905d109dc9461c7810c8d70449132f8 (patch) | |
| tree | 1425a089580634b8285954733e7ea2bca06e3f4a /java/java.go | |
| parent | 4358b7cc045b62ca28015a88506469f571d92d52 (diff) | |
| parent | 9863d53618714a36c3f254d949497a7eb2d11863 (diff) | |
| download | build_soong-android-10.0.0_r6.tar.gz build_soong-android-10.0.0_r6.tar.bz2 build_soong-android-10.0.0_r6.zip | |
Merge cherrypicks of [8673593, 8673409, 8673796, 8673797, 8673798, 8673855, 8673151, 8673594, 8673499, 8673799, 8673895, 8673896] into qt-releaseandroid-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r1android-security-10.0.0_r48android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1
Change-Id: I4173c76b7399b84f27ab3c513f11b82a78320e77
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 ff6bbacc..bf738c4d 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 { |