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

For each sdk built generate a JSON file describing its contents

Browse Source 
Some build scripts need to know information about the contents of an
sdk, such as what APIs it provides (via java_sdk_library). Rather than
duplicate that information in the scripts or attempt to access that
information (where available) by looking at the contents of the
snapshot this change generates a JSON file that sits alongside the
snapshot itself.

The info file can be generated without generating the snapshot zip file
but whenever a snapshot zip file is generated the info is generated
too. The info file sits alongside the zip file in out/mainline-sdks.

Bug: 204763318
Test: m art-module-sdk
      m dist
Merged-In: I289530bb21693dc6443826c24c17c9b5d85d2d8b
Change-Id: I289530bb21693dc6443826c24c17c9b5d85d2d8b
(cherry picked from commit c6ba182f3c)
This commit is contained in:
Paul Duffin
2022-05-06 09:38:02 +00:00
parent 13214f1486
commit 1a44a993b5
5 changed files with 212 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sdk/sdk.go
View File

@@ -76,6 +76,8 @@ type sdk struct {
snapshotFile android.OptionalPath
infoFile android.OptionalPath
// The builder, preserved for testing.
builderForTests *snapshotBuilder
}
@@ -192,27 +194,32 @@ func (s *sdk) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
// Generate the snapshot from the member info.
p := s.buildSnapshot(ctx, sdkVariants)
zip := ctx.InstallFile(android.PathForMainlineSdksInstall(ctx), p.Base(), p)
s.snapshotFile = android.OptionalPathForPath(zip)
s.buildSnapshot(ctx, sdkVariants)
}
}
func (s *sdk) AndroidMkEntries() []android.AndroidMkEntries {
if !s.snapshotFile.Valid() {
if !s.snapshotFile.Valid() != !s.infoFile.Valid() {
panic("Snapshot (%q) and info file (%q) should both be set or neither should be set.")
} else if !s.snapshotFile.Valid() {
return []android.AndroidMkEntries{}
}
return []android.AndroidMkEntries{android.AndroidMkEntries{
Class: "FAKE",
OutputFile: s.snapshotFile,
DistFiles: android.MakeDefaultDistFiles(s.snapshotFile.Path()),
DistFiles: android.MakeDefaultDistFiles(s.snapshotFile.Path(), s.infoFile.Path()),
Include: "$(BUILD_PHONY_PACKAGE)",
ExtraFooters: []android.AndroidMkExtraFootersFunc{
func(w io.Writer, name, prefix, moduleDir string) {
// Allow the sdk to be built by simply passing its name on the command line.
fmt.Fprintln(w, ".PHONY:", s.Name())
fmt.Fprintln(w, s.Name()+":", s.snapshotFile.String())
// Allow the sdk info to be built by simply passing its name on the command line.
infoTarget := s.Name() + ".info"
fmt.Fprintln(w, ".PHONY:", infoTarget)
fmt.Fprintln(w, infoTarget+":", s.infoFile.String())
},
},
}}