diff options
| author | 2021-04-13 17:29:03 +0000 | |
|---|---|---|
| committer | 2021-04-13 17:29:03 +0000 | |
| commit | 149e19ef703bd22c4afe670e7aaad6260e04dca2 (patch) | |
| tree | 9f78a35d8175bc6f4a54552ee6ec7fb167f545d6 /java/platform_bootclasspath.go | |
| parent | 41cca851d944e2c4efb2fdbb866c1fb022207505 (diff) | |
| parent | 90b8ad38e08ede09d3c62d1a2b60f2a8f51afe8a (diff) | |
Merge "Remove noop code from generateHiddenAPIBuildActions"
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 86ab70865..fa13332dc 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -261,16 +261,10 @@ func (b *platformBootclasspathModule) getImageConfig(ctx android.EarlyModuleCont // generateHiddenAPIBuildActions generates all the hidden API related build rules. func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android.ModuleContext, modules []android.Module) { - // Save the paths to the monolithic files for retrieval via OutputFiles() - // Make the paths relative to the out/soong/hiddenapi directory instead of to the out/soong/ - // directory. This ensures that if they are used as java_resources they do not end up in a - // hiddenapi directory in the resulting APK. - relToHiddenapiDir := func(path android.OutputPath) android.Path { - return path - } - b.hiddenAPIFlagsCSV = relToHiddenapiDir(hiddenAPISingletonPaths(ctx).flags) - b.hiddenAPIIndexCSV = relToHiddenapiDir(hiddenAPISingletonPaths(ctx).index) - b.hiddenAPIMetadataCSV = relToHiddenapiDir(hiddenAPISingletonPaths(ctx).metadata) + // Save the paths to the monolithic files for retrieval via OutputFiles(). + b.hiddenAPIFlagsCSV = hiddenAPISingletonPaths(ctx).flags + b.hiddenAPIIndexCSV = hiddenAPISingletonPaths(ctx).index + b.hiddenAPIMetadataCSV = hiddenAPISingletonPaths(ctx).metadata moduleSpecificFlagsPaths := android.Paths{} for _, module := range modules { |