diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-05-14 19:18:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-14 19:18:34 +0000 |
| commit | 97961f48374b0b58ee772c1c4fd01d32db9628d7 (patch) | |
| tree | 415935588ace31679d99531ad9ee775f4fc8fdb8 /java/java.go | |
| parent | b28f5620926564eb23cf5135e59f1b71a9ed6e00 (diff) | |
| parent | b7c78731d4cccf00645d8fb3d6ed9c692e4b83f7 (diff) | |
Merge "Stop generating unnecessary hidden API rules" am: b7c78731d4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1707574
Change-Id: I96fab0709252e6c0730b5a22a06e8a02358653a3
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 9a5fbfc35..f85de3d77 100644 --- a/java/java.go +++ b/java/java.go @@ -1315,7 +1315,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { di := ctx.OtherModuleProvider(deapexerModule, android.DeapexerProvider).(android.DeapexerInfo) if dexOutputPath := di.PrebuiltExportPath(j.BaseModuleName(), ".dexjar"); dexOutputPath != nil { j.dexJarFile = dexOutputPath - j.hiddenAPIExtractInformation(ctx, dexOutputPath, outputFile) + j.hiddenAPIUpdatePaths(ctx, dexOutputPath, outputFile) } else { // This should never happen as a variant for a prebuilt_apex is only created if the // prebuilt_apex has been configured to export the java library dex file. @@ -1346,9 +1346,11 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { return } - // Hidden API CSV generation and dex encoding - dexOutputFile = j.hiddenAPIExtractAndEncode(ctx, dexOutputFile, outputFile, - proptools.Bool(j.dexProperties.Uncompress_dex)) + // Update hidden API paths. + j.hiddenAPIUpdatePaths(ctx, dexOutputFile, outputFile) + + // Encode hidden API flags in dex file. + dexOutputFile = j.hiddenAPIEncodeDex(ctx, dexOutputFile, proptools.Bool(j.dexProperties.Uncompress_dex)) j.dexJarFile = dexOutputFile } |