Clean up: remove com.android.gki.*
It's abandoned. Bug: n/a Test: m nothing --no-skip-soong-tests Change-Id: I220bea87329ee532d494cc4eaa4c6a8c1b0bff07
This commit is contained in:
@@ -280,7 +280,6 @@ type ApexProperties struct {
|
||||
//
|
||||
// "//apex_available:anyapex" is a pseudo APEX name that matches to any APEX.
|
||||
// "//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"].
|
||||
Apex_available []string
|
||||
|
||||
@@ -473,14 +472,12 @@ func (m *ApexModuleBase) DepIsInSameApex(ctx BaseModuleContext, dep Module) bool
|
||||
const (
|
||||
AvailableToPlatform = "//apex_available:platform"
|
||||
AvailableToAnyApex = "//apex_available:anyapex"
|
||||
AvailableToGkiApex = "com.android.gki.*"
|
||||
)
|
||||
|
||||
var (
|
||||
AvailableToRecognziedWildcards = []string{
|
||||
AvailableToPlatform,
|
||||
AvailableToAnyApex,
|
||||
AvailableToGkiApex,
|
||||
}
|
||||
)
|
||||
|
||||
@@ -496,7 +493,6 @@ func CheckAvailableForApex(what string, apex_available []string) bool {
|
||||
}
|
||||
return InList(what, apex_available) ||
|
||||
(what != AvailableToPlatform && InList(AvailableToAnyApex, apex_available)) ||
|
||||
(strings.HasPrefix(what, "com.android.gki.") && InList(AvailableToGkiApex, apex_available)) ||
|
||||
(what == "com.google.mainline.primary.libs") || // TODO b/248601389
|
||||
(what == "com.google.mainline.go.primary.libs") // TODO b/248601389
|
||||
}
|
||||
@@ -524,7 +520,7 @@ func (m *ApexModuleBase) SetNotAvailableForPlatform() {
|
||||
// This function makes sure that the apex_available property is valid
|
||||
func (m *ApexModuleBase) checkApexAvailableProperty(mctx BaseModuleContext) {
|
||||
for _, n := range m.ApexProperties.Apex_available {
|
||||
if n == AvailableToPlatform || n == AvailableToAnyApex || n == AvailableToGkiApex {
|
||||
if n == AvailableToPlatform || n == AvailableToAnyApex {
|
||||
continue
|
||||
}
|
||||
if !mctx.OtherModuleExists(n) && !mctx.Config().AllowMissingDependencies() {
|
||||
|
@@ -384,7 +384,7 @@ func TestBasicApex(t *testing.T) {
|
||||
symlink_preferred_arch: true,
|
||||
system_shared_libs: [],
|
||||
stl: "none",
|
||||
apex_available: [ "myapex", "com.android.gki.*" ],
|
||||
apex_available: [ "myapex" ],
|
||||
}
|
||||
|
||||
rust_binary {
|
||||
@@ -432,14 +432,6 @@ func TestBasicApex(t *testing.T) {
|
||||
apex_available: ["myapex"],
|
||||
}
|
||||
|
||||
apex {
|
||||
name: "com.android.gki.fake",
|
||||
binaries: ["foo"],
|
||||
key: "myapex.key",
|
||||
file_contexts: ":myapex-file_contexts",
|
||||
updatable: false,
|
||||
}
|
||||
|
||||
cc_library_shared {
|
||||
name: "mylib2",
|
||||
srcs: ["mylib.cpp"],
|
||||
|
Reference in New Issue
Block a user