openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Change-Id: I27758217e5dfd1660729e39125d4a5d9224bd25b
This commit is contained in:
Paul Duffin 2021-04-13 18:25:04 +00:00 committed by Automerger Merge Worker
parent 3b3c5a1a12 ee207a67e8
commit 97838afd6f
1 changed files with 4 additions and 10 deletions
Show Stats 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 {