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

Merge "Support com.android.gki.* in apex_available."

Browse Source
This commit is contained in:
Yifan Hong
2020-08-04 19:06:08 +00:00
committed by Gerrit Code Review
parent 89e4882d37 d22a84a88b
commit ea3574b5fa
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android/apex.go
View File

@@ -137,6 +137,7 @@ type ApexProperties struct {
// //
// "//apex_available:anyapex" is a pseudo APEX name that matches to any APEX. // "//apex_available:anyapex" is a pseudo APEX name that matches to any APEX.
// "//apex_available:platform" refers to non-APEX partitions like "system.img". // "//apex_available:platform" refers to non-APEX partitions like "system.img".
// "com.android.gki.*" matches any APEX module name with the prefix "com.android.gki.".
// Default is ["//apex_available:platform"]. // Default is ["//apex_available:platform"].
Apex_available []string Apex_available []string
@@ -213,6 +214,7 @@ func (m *ApexModuleBase) IsInstallableToApex() bool {
const ( const (
AvailableToPlatform = "//apex_available:platform" AvailableToPlatform = "//apex_available:platform"
AvailableToAnyApex = "//apex_available:anyapex" AvailableToAnyApex = "//apex_available:anyapex"
AvailableToGkiApex = "com.android.gki.*"
) )
func CheckAvailableForApex(what string, apex_available []string) bool { func CheckAvailableForApex(what string, apex_available []string) bool {
@@ -222,7 +224,8 @@ func CheckAvailableForApex(what string, apex_available []string) bool {
return what == AvailableToPlatform return what == AvailableToPlatform
} }
return InList(what, apex_available) || return InList(what, apex_available) ||
(what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) (what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) ||
(strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available))
} }
func (m *ApexModuleBase) AvailableFor(what string) bool { func (m *ApexModuleBase) AvailableFor(what string) bool {
@@ -256,7 +259,7 @@ func (m *ApexModuleBase) ChooseSdkVersion(versionList []string, maxSdkVersion in
func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) { func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) {
for _, n := range m.ApexProperties.Apex_available { for _, n := range m.ApexProperties.Apex_available {
if n == AvailableToPlatform || n == AvailableToAnyApex { if n == AvailableToPlatform || n == AvailableToAnyApex || n == AvailableToGkiApex {
continue continue
} }
if !mctx.OtherModuleExists(n) && !mctx.Config().AllowMissingDependencies() { if !mctx.OtherModuleExists(n) && !mctx.Config().AllowMissingDependencies() {

9
apex/apex_test.go
View File

@@ -414,7 +414,14 @@ func TestBasicApex(t *testing.T) {
system_shared_libs: [], system_shared_libs: [],
static_executable: true, static_executable: true,
stl: "none", stl: "none",
apex_available: [ "myapex" ], apex_available: [ "myapex", "com.android.gki.*" ],
}
apex {
name: "com.android.gki.fake",
binaries: ["foo"],
key: "myapex.key",
file_contexts: ":myapex-file_contexts",
} }
cc_library_shared { cc_library_shared {