diff options
| author | 2021-02-03 10:02:36 +0000 | |
|---|---|---|
| committer | 2021-02-03 10:02:36 +0000 | |
| commit | e1f9b35d9250b7c0f5290e7da70ee71945d2b15e (patch) | |
| tree | 25f66ab0d7a6b5daa43bebc6cacb998f67668a1c /java/hiddenapi.go | |
| parent | 7e2fad3f8998f0c3ef9bf1f4a17e18a561fce5ba (diff) | |
| parent | 612e61006324d830cfeb65025a63ae31cb913422 (diff) | |
Merge "Switch hiddenapi to use OutputPath instead of ModuleOutPath"
Diffstat (limited to 'java/hiddenapi.go')
| -rw-r--r-- | java/hiddenapi.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/hiddenapi.go b/java/hiddenapi.go index 2cd025e43..eafbf5df0 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -89,8 +89,8 @@ type hiddenAPIIntf interface { var _ hiddenAPIIntf = (*hiddenAPI)(nil) -func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, name string, primary bool, dexJar android.ModuleOutPath, - implementationJar android.Path, uncompressDex bool) android.ModuleOutPath { +func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, name string, primary bool, dexJar android.OutputPath, + implementationJar android.Path, uncompressDex bool) android.OutputPath { if !ctx.Config().IsEnvTrue("UNSAFE_DISABLE_HIDDENAPI_FLAGS") { // Modules whose names are of the format <x>-hiddenapi provide hiddenapi information @@ -116,7 +116,7 @@ func (h *hiddenAPI) hiddenAPI(ctx android.ModuleContext, name string, primary bo // hiddenapi information for a module on the boot jars list then encode // the gathered information in the generated dex file. if name == bootJarName { - hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", name+".jar") + hiddenAPIJar := android.PathForModuleOut(ctx, "hiddenapi", name+".jar").OutputPath // More than one library with the same classes can be encoded but only one can // be added to the global set of flags, otherwise it will result in duplicate |