diff options
| author | Jiyong Park <jiyong@google.com> | 2019-07-15 15:29:23 +0900 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-17 03:10:13 +0000 |
| commit | 2c7b1c41cd603dece99e8e93f888b83650271e98 (patch) | |
| tree | 33cdd57ec97a46a8c44d993fc0532b21f29f76f3 | |
| parent | 4358b7cc045b62ca28015a88506469f571d92d52 (diff) | |
| download | build_soong-2c7b1c41cd603dece99e8e93f888b83650271e98.tar.gz build_soong-2c7b1c41cd603dece99e8e93f888b83650271e98.tar.bz2 build_soong-2c7b1c41cd603dece99e8e93f888b83650271e98.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.
Merged-In: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
(cherry picked from commit 716828ab4ec2a673e6022171bb2b52584ee8e916)
| -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 b1ddab48..9627dc64 100644 --- a/java/hiddenapi_singleton.go +++ b/java/hiddenapi_singleton.go @@ -61,7 +61,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 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 { |