diff options
| author | 2021-02-09 13:57:52 +0000 | |
|---|---|---|
| committer | 2021-02-09 13:57:52 +0000 | |
| commit | b71a8de0d5cc7571a7c900c1573c7cda38de9c2b (patch) | |
| tree | 1e7882943fa1465cd3b33764a1312d07fa8499ca /java/java.go | |
| parent | abe1abd224036ded5b9438d943f567dc6fdf07b4 (diff) | |
| parent | 4fd997bc137e31ce66d6ef4ad64d166d72692187 (diff) | |
Merge "Refactor the hiddenAPI() method for reusability"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index cee14cc4b..dfbcd6f54 100644 --- a/java/java.go +++ b/java/java.go @@ -1805,7 +1805,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { primary = primary && !j.IsReplacedByPrebuilt() // Hidden API CSV generation and dex encoding - dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, configurationName, primary, dexOutputFile, j.implementationJarFile, + dexOutputFile = j.hiddenAPIExtractAndEncode(ctx, configurationName, primary, dexOutputFile, j.implementationJarFile, proptools.Bool(j.dexProperties.Uncompress_dex)) // merge dex jar with resources if necessary @@ -2965,7 +2965,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { primary := j.Prebuilt().UsePrebuilt() // Hidden API CSV generation and dex encoding - dexOutputFile = j.hiddenAPI.hiddenAPI(ctx, configurationName, primary, dexOutputFile, outputFile, + dexOutputFile = j.hiddenAPIExtractAndEncode(ctx, configurationName, primary, dexOutputFile, outputFile, proptools.Bool(j.dexProperties.Uncompress_dex)) j.dexJarFile = dexOutputFile |