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

Merge "Clean up: remove com.android.gki.*" into main am: 75b14ee1a6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3223004

Change-Id: Ia630547bc9458b60ec31c7cc50a3cba762f11334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-08-16 22:31:19 +00:00
committed by Automerger Merge Worker
parent 5e989b554c 75b14ee1a6
commit 48f28c9232
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/apex.go
View File

@@ -280,7 +280,6 @@ 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
@@ -473,14 +472,12 @@ func (m *ApexModuleBase) DepIsInSameApex(ctx BaseModuleContext, dep Module) bool
const ( const (
AvailableToPlatform = "//apex_available:platform" AvailableToPlatform = "//apex_available:platform"
AvailableToAnyApex = "//apex_available:anyapex" AvailableToAnyApex = "//apex_available:anyapex"
AvailableToGkiApex = "com.android.gki.*"
) )
var ( var (
AvailableToRecognziedWildcards = []string{ AvailableToRecognziedWildcards = []string{
AvailableToPlatform, AvailableToPlatform,
AvailableToAnyApex, AvailableToAnyApex,
AvailableToGkiApex,
} }
) )
@@ -496,7 +493,6 @@ func CheckAvailableForApex(what string, apex_available []string) bool {
} }
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)) ||
(what == "com.google.mainline.primary.libs") || // TODO b/248601389 (what == "com.google.mainline.primary.libs") || // TODO b/248601389
(what == "com.google.mainline.go.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 // This function makes sure that the apex_available property is valid
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 || n == AvailableToGkiApex { if n == AvailableToPlatform || n == AvailableToAnyApex {
continue continue
} }
if !mctx.OtherModuleExists(n) && !mctx.Config().AllowMissingDependencies() { if !mctx.OtherModuleExists(n) && !mctx.Config().AllowMissingDependencies() {

10
apex/apex_test.go
View File

@@ -384,7 +384,7 @@ func TestBasicApex(t *testing.T) {
symlink_preferred_arch: true, symlink_preferred_arch: true,
system_shared_libs: [], system_shared_libs: [],
stl: "none", stl: "none",
apex_available: [ "myapex", "com.android.gki.*" ], apex_available: [ "myapex" ],
} }
rust_binary { rust_binary {
@@ -432,14 +432,6 @@ func TestBasicApex(t *testing.T) {
apex_available: ["myapex"], apex_available: ["myapex"],
} }
apex {
name: "com.android.gki.fake",
binaries: ["foo"],
key: "myapex.key",
file_contexts: ":myapex-file_contexts",
updatable: false,
}
cc_library_shared { cc_library_shared {
name: "mylib2", name: "mylib2",
srcs: ["mylib.cpp"], srcs: ["mylib.cpp"],