StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove noop code from generateHiddenAPIBuildActions" am: 149e19ef70

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1674035

Change-Id: Ibd438c9ca550d72bde0f0d83df3e093051596cb8
This commit is contained in:
Paul Duffin
2021-04-13 17:42:20 +00:00
committed by Automerger Merge Worker
parent b50de53589 149e19ef70
commit ee207a67e8
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/platform_bootclasspath.go
View File

@@ -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 {