diff options
author | 2024-09-06 06:07:42 +0000 | |
---|---|---|
committer | 2024-09-06 06:07:42 +0000 | |
commit | fae5ec8bbca887066716029a4923c110d819c958 (patch) | |
tree | 9ca819979f6141bab733c14445fe7b8083ed3744 /apex/bootclasspath_fragment_test.go | |
parent | 4301e29a02937b1ef1b50e7660ee33205bc33d9c (diff) | |
parent | 003452ff9c3b0dfe57be563d647c9a8dd76e0569 (diff) |
Merge changes I505a7ad8,I92d88199 into main
* changes:
Disable source apex variant using apex_available_name
Skip `contents` validation of source bootclasspath fragments
Diffstat (limited to 'apex/bootclasspath_fragment_test.go')
-rw-r--r-- | apex/bootclasspath_fragment_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apex/bootclasspath_fragment_test.go b/apex/bootclasspath_fragment_test.go index 7cad337cb..df7857f29 100644 --- a/apex/bootclasspath_fragment_test.go +++ b/apex/bootclasspath_fragment_test.go @@ -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", |