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

Add support of <APEX>_backing.txt in mixed build.

Browse Source 
Bug: 239081456
Test: CIs
Change-Id: I8a8a5e606d5b1bc19294fc92cd469e7aa01cdb43
This commit is contained in:
Wei Li
2022-11-07 14:25:34 -08:00
parent 66fc74509f
commit cc73a05670
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/apex.go
View File

@@ -1908,8 +1908,7 @@ func (a *apexBundle) ProcessBazelQueryResponse(ctx android.ModuleContext) {
// TODO(b/239081457): Generate the bazel bundle module file from the apex rule. // TODO(b/239081457): Generate the bazel bundle module file from the apex rule.
a.bundleModuleFile = android.PathForBazelOut(ctx, a.Name()+apexType.suffix()+"-base.zip") 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))
// TODO(b/239081456): Generate the backing.txt file from Bazel. a.nativeApisBackedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.BackingLibs))
a.nativeApisBackedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, a.Name()+"_backing.txt"))
// TODO(b/239084755): Generate the java api using.xml file from Bazel. // TODO(b/239084755): Generate the java api using.xml file from Bazel.
a.javaApisUsedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, a.Name()+"_using.xml")) a.javaApisUsedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, a.Name()+"_using.xml"))
installSuffix := imageApexSuffix installSuffix := imageApexSuffix

2
bazel/cquery/request_type.go
View File

@@ -219,6 +219,7 @@ return json_encode({
"container_key_info": [container_key_info.pem.path, container_key_info.pk8.path, container_key_info.key_name], "container_key_info": [container_key_info.pem.path, container_key_info.pk8.path, container_key_info.key_name],
"package_name": info.package_name, "package_name": info.package_name,
"symbols_used_by_apex": info.symbols_used_by_apex.path, "symbols_used_by_apex": info.symbols_used_by_apex.path,
"backing_libs": info.backing_libs.path,
})` })`
} }
@@ -231,6 +232,7 @@ type ApexInfo struct {
ContainerKeyInfo []string `json:"container_key_info"` ContainerKeyInfo []string `json:"container_key_info"`
PackageName string `json:"package_name"` PackageName string `json:"package_name"`
SymbolsUsedByApex string `json:"symbols_used_by_apex"` SymbolsUsedByApex string `json:"symbols_used_by_apex"`
BackingLibs string `json:"backing_libs"`
} }
// 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.

2
bazel/cquery/request_type_test.go
View File

@@ -149,6 +149,7 @@ func TestGetApexInfoParseResults(t *testing.T) {
`"container_key_info":["foo.x509.pem", "foo.pk8", "foo"],` + `"container_key_info":["foo.x509.pem", "foo.pk8", "foo"],` +
`"package_name":"package.name",` + `"package_name":"package.name",` +
`"symbols_used_by_apex": "path/to/my.apex_using.txt",` + `"symbols_used_by_apex": "path/to/my.apex_using.txt",` +
`"backing_libs":"path/to/backing.txt",` +
`"provides_native_libs":[]}`, `"provides_native_libs":[]}`,
expectedOutput: ApexInfo{ expectedOutput: ApexInfo{
SignedOutput: "my.apex", SignedOutput: "my.apex",
@@ -159,6 +160,7 @@ func TestGetApexInfoParseResults(t *testing.T) {
ContainerKeyInfo: []string{"foo.x509.pem", "foo.pk8", "foo"}, ContainerKeyInfo: []string{"foo.x509.pem", "foo.pk8", "foo"},
PackageName: "package.name", PackageName: "package.name",
SymbolsUsedByApex: "path/to/my.apex_using.txt", SymbolsUsedByApex: "path/to/my.apex_using.txt",
BackingLibs: "path/to/backing.txt",
}, },
}, },
} }