diff options
| author | Colin Cross <ccross@android.com> | 2019-05-28 14:06:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-05-28 21:48:54 +0000 |
| commit | 9c74a1ee855b1dcf4871a4cc40f317bd765ab7fd (patch) | |
| tree | 2ad36147e5cb066ead411d26173e415321286877 /java/java.go | |
| parent | ff3f43857fce71fefac445dbf953386f1b7c8c03 (diff) | |
Don't build hiddenapi flags or encode dex for unbundled builds
Builds with TARGET_BUILD_APPS shouldn't build the hiddenapi flags
or encode dex files even if frameworks/base exists.
Bug: 133343287
Test: mainline modules build
Change-Id: I0647451420fd09bb680808b35e1ad3b8f514ba46
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go index 44830839d..8dbdfb6a7 100644 --- a/java/java.go +++ b/java/java.go @@ -1301,9 +1301,11 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { return } - // Hidden API CSV generation and dex encoding - dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, dexOutputFile, j.implementationJarFile, - j.deviceProperties.UncompressDex) + if !ctx.Config().UnbundledBuild() { + // 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 { |