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

Connect base.zip to mixed builds

Browse Source 
Test: go test soong tests
Test: mixed_droid
Change-Id: Iaf1fbd1e7cde63892b01a9c9f4cd29ae69e2d6e3
This commit is contained in:
Liz Kammer
2022-11-04 16:12:43 -04:00
parent 1ec7785ec5
commit 303978dcd2
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -1903,10 +1903,10 @@ func (a *apexBundle) ProcessBazelQueryResponse(ctx android.ModuleContext) {
apexType := a.properties.ApexType apexType := a.properties.ApexType
switch apexType { switch apexType {
case imageApex: case imageApex:
// TODO(b/190817312): Generate the notice file from the apex rule. // TODO(b/190817312): Generate the notice file from the apex rule.
a.htmlGzNotice = android.PathForBazelOut(ctx, "NOTICE.html.gz") a.htmlGzNotice = android.PathForBazelOut(ctx, "NOTICE.html.gz")
// TODO(b/239081457): Generate the bazel bundle module file from the apex rule. a.bundleModuleFile = android.PathForBazelOut(ctx, outputs.BundleFile)
a.bundleModuleFile = android.PathForBazelOut(ctx, a.Name()+apexType.suffix()+"-base.zip")
a.nativeApisUsedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.SymbolsUsedByApex)) a.nativeApisUsedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.SymbolsUsedByApex))
a.nativeApisBackedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.BackingLibs)) a.nativeApisBackedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.BackingLibs))
// TODO(b/239084755): Generate the java api using.xml file from Bazel. // TODO(b/239084755): Generate the java api using.xml file from Bazel.

10
apex/apex_test.go
View File

@@ -9760,6 +9760,7 @@ apex {
ContainerKeyInfo: []string{"container_cert", "container_private"}, ContainerKeyInfo: []string{"container_cert", "container_private"},
SymbolsUsedByApex: "foo_using.txt", SymbolsUsedByApex: "foo_using.txt",
JavaSymbolsUsedByApex: "foo_using.xml", JavaSymbolsUsedByApex: "foo_using.xml",
BundleFile: "apex_bundle.zip",
// unused // unused
PackageName: "pkg_name", PackageName: "pkg_name",
@@ -9804,4 +9805,13 @@ apex {
if w, g := "out/bazel/execroot/__main__/foo_using.xml", ab.javaApisUsedByModuleFile.String(); w != g { if w, g := "out/bazel/execroot/__main__/foo_using.xml", ab.javaApisUsedByModuleFile.String(); w != g {
t.Errorf("Expected output file %q, got %q", w, g) t.Errorf("Expected output file %q, got %q", w, g)
} }
mkData := android.AndroidMkDataForTest(t, result.TestContext, m)
var builder strings.Builder
mkData.Custom(&builder, "foo", "BAZEL_TARGET_", "", mkData)
data := builder.String()
if w := "ALL_MODULES.$(my_register_name).BUNDLE := out/bazel/execroot/__main__/apex_bundle.zip"; !strings.Contains(data, w) {
t.Errorf("Expected %q in androidmk data, but did not find %q", w, data)
}
} }

2
bazel/cquery/request_type.go
View File

@@ -221,6 +221,7 @@ return json_encode({
"symbols_used_by_apex": info.symbols_used_by_apex.path, "symbols_used_by_apex": info.symbols_used_by_apex.path,
"java_symbols_used_by_apex": info.java_symbols_used_by_apex.path, "java_symbols_used_by_apex": info.java_symbols_used_by_apex.path,
"backing_libs": info.backing_libs.path, "backing_libs": info.backing_libs.path,
"bundle_file": info.base_with_config_zip.path,
})` })`
} }
@@ -235,6 +236,7 @@ type ApexInfo struct {
SymbolsUsedByApex string `json:"symbols_used_by_apex"` SymbolsUsedByApex string `json:"symbols_used_by_apex"`
JavaSymbolsUsedByApex string `json:"java_symbols_used_by_apex"` JavaSymbolsUsedByApex string `json:"java_symbols_used_by_apex"`
BackingLibs string `json:"backing_libs"` BackingLibs string `json:"backing_libs"`
BundleFile string `json:"bundle_file"`
} }
// ParseResult returns a value obtained by parsing the result of the request's Starlark function. // ParseResult returns a value obtained by parsing the result of the request's Starlark function.