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

Merge changes I505a7ad8,I92d88199 into main

Browse Source 
* changes:
  Disable source apex variant using apex_available_name
  Skip `contents` validation of source bootclasspath fragments
This commit is contained in:
Treehugger Robot
2024-09-06 06:07:42 +00:00
committed by Gerrit Code Review
parent 4301e29a02 003452ff9c
commit fae5ec8bbc
5 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apex/apex.go
View File

@@ -1078,6 +1078,7 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
ApexContents: []*android.ApexContents{apexContents},
TestApexes: testApexes,
BaseApexName: mctx.ModuleName(),
ApexAvailableName: proptools.String(a.properties.Apex_available_name),
}
mctx.WalkDeps(func(child, parent android.Module) bool {
if !continueApexDepsWalk(child, parent) {

4
apex/bootclasspath_fragment_test.go
View File

@@ -835,6 +835,7 @@ func TestBootclasspathFragment_HiddenAPIList(t *testing.T) {
`)
java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{
"all_apex_contributions",
"art-bootclasspath-fragment",
"bar",
"dex2oatd",
@@ -1006,6 +1007,7 @@ func TestBootclasspathFragment_AndroidNonUpdatable_FromSource(t *testing.T) {
`)
java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{
"all_apex_contributions",
"android-non-updatable.stubs",
"android-non-updatable.stubs.module_lib",
"android-non-updatable.stubs.system",
@@ -1178,6 +1180,7 @@ func TestBootclasspathFragment_AndroidNonUpdatable_FromText(t *testing.T) {
`)
java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{
"all_apex_contributions",
"android-non-updatable.stubs",
"android-non-updatable.stubs.system",
"android-non-updatable.stubs.test",
@@ -1331,6 +1334,7 @@ func TestBootclasspathFragment_AndroidNonUpdatable_AlwaysUsePrebuiltSdks(t *test
`)
java.CheckModuleDependencies(t, result.TestContext, "mybootclasspathfragment", "android_common_apex10000", []string{
"all_apex_contributions",
"art-bootclasspath-fragment",
"bar",
"dex2oatd",