diff options
| author | Jiyong Park <jiyong@google.com> | 2019-07-15 15:29:23 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2019-07-15 17:17:31 +0900 |
| commit | 09cb629c1558e13f2654baaf458619435203f58a (patch) | |
| tree | ead473e88fae50ae29f4b6a7dfac088147781730 /java | |
| parent | 50b81e532be49a797f9aef09193f0471ab35b9ff (diff) | |
| download | build_soong-09cb629c1558e13f2654baaf458619435203f58a.tar.gz build_soong-09cb629c1558e13f2654baaf458619435203f58a.tar.bz2 build_soong-09cb629c1558e13f2654baaf458619435203f58a.zip | |
Revert "Don't build hiddenapi flags or encode dex for unbundled builds"
This reverts commit 7b8a567f44b3fdb30eac8211e8ed8e27fb162797.
Bug: 137282010
Test: With the CL above this one, the unbundled mainline module build
does not fail.
Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
Diffstat (limited to 'java')
| -rw-r--r-- | java/hiddenapi_singleton.go | 2 | ||||
| -rw-r--r-- | java/java.go | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/java/hiddenapi_singleton.go b/java/hiddenapi_singleton.go index cf9f4928..3030a927 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -64,7 +64,7 @@ func (h *hiddenAPISingleton) GenerateBuildActions(ctx android.SingletonContext) stubFlagsRule(ctx) // These rules depend on files located in frameworks/base, skip them if running in a tree that doesn't have them. - if ctx.Config().FrameworksBaseDirExists(ctx) && !ctx.Config().UnbundledBuild() { + if ctx.Config().FrameworksBaseDirExists(ctx) { h.flags = flagsRule(ctx) h.metadata = metadataRule(ctx) } else { diff --git a/java/java.go b/java/java.go index 7c84e766..318a36b8 100644 --- a/java/java.go +++ b/java/java.go @@ -1322,11 +1322,9 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar 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 { |