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

Preopt APEX system server jars from prebuilts.

Browse Source 
Similar to the previous CL, but for jars from prebuilts.

Test: manual - 1. Patch aosp/1818020 and aosp/1810840.
  2. m SOONG_CONFIG_art_module_source_build=false com.android.art
Bug: 194150908
Change-Id: Idc0c73a78045a602ad3a91cb5071d291bd611015
This commit is contained in:
Jiakai Zhang
2021-09-09 08:12:46 +00:00
parent ca9bc98e0c
commit 204356f3b5
6 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/deapexer.go
View File

@@ -73,7 +73,7 @@ type DeapexerInfo struct {
// exported file name is the apex relative path, e.g. javalib/core-libart.jar.
//
// See Prebuilt.ApexInfoMutator for more information.
exports map[string]Path
exports map[string]WritablePath
}
// PrebuiltExportPath provides the path, or nil if not available, of a file exported from the
@@ -82,7 +82,7 @@ type DeapexerInfo struct {
// The exported file is identified by the apex relative path, e.g. "javalib/core-libart.jar".
//
// See apex/deapexer.go for more information.
func (i DeapexerInfo) PrebuiltExportPath(apexRelativePath string) Path {
func (i DeapexerInfo) PrebuiltExportPath(apexRelativePath string) WritablePath {
path := i.exports[apexRelativePath]
return path
}
@@ -95,7 +95,7 @@ var DeapexerProvider = blueprint.NewProvider(DeapexerInfo{})
// for use with a prebuilt_apex module.
//
// See apex/deapexer.go for more information.
func NewDeapexerInfo(exports map[string]Path) DeapexerInfo {
func NewDeapexerInfo(exports map[string]WritablePath) DeapexerInfo {
return DeapexerInfo{
exports: exports,
}