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:20:47 +0900 |
| commit | 716828ab4ec2a673e6022171bb2b52584ee8e916 (patch) | |
| tree | 33cdd57ec97a46a8c44d993fc0532b21f29f76f3 /java/hiddenapi_singleton.go | |
| parent | 3b98a509f19cb25e9734bb62ba0b592663ed8e4e (diff) | |
| download | android_build_soong-716828ab4ec2a673e6022171bb2b52584ee8e916.tar.gz android_build_soong-716828ab4ec2a673e6022171bb2b52584ee8e916.tar.bz2 android_build_soong-716828ab4ec2a673e6022171bb2b52584ee8e916.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
Diffstat (limited to 'java/hiddenapi_singleton.go')
| -rw-r--r-- | java/hiddenapi_singleton.go | 2 |
1 files changed, 1 insertions, 1 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 { |