diff options
| author | 2023-11-01 15:29:09 -0700 | |
|---|---|---|
| committer | 2023-11-01 15:29:09 -0700 | |
| commit | 9bef67488d1fabc0b8341a143eed599dfb80cc5d (patch) | |
| tree | ad7db83d0c617ee3379724a50eacfd0c9e82b0cb /java/android_manifest_test.go | |
| parent | eb852927d4b8579f1b395e5afb2cacf2c76a087e (diff) | |
Remove sdkPreSingleton and overlaySingleton
These were the only 2 pre-singletons in soong. sdkPreSingleton is
totally unused. overlaySingleton can be done during
GenerateAndroidBuildActions instead.
Test: m nothing --no-skip-soong-tests
Change-Id: Ieb5ab92f18cb56be4049c0842f61df8aa02dc52c
Diffstat (limited to 'java/android_manifest_test.go')
| -rw-r--r-- | java/android_manifest_test.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/java/android_manifest_test.go b/java/android_manifest_test.go index 0a39dca86..5909b1e6a 100644 --- a/java/android_manifest_test.go +++ b/java/android_manifest_test.go @@ -78,10 +78,7 @@ func TestManifestMerger(t *testing.T) { } ` - result := android.GroupFixturePreparers( - PrepareForTestWithJavaDefaultModules, - PrepareForTestWithOverlayBuildComponents, - ).RunTestWithBp(t, bp) + result := PrepareForTestWithJavaDefaultModules.RunTestWithBp(t, bp) manifestMergerRule := result.ModuleForTests("app", "android_common").Rule("manifestMerger") android.AssertPathRelativeToTopEquals(t, "main manifest", @@ -129,10 +126,7 @@ func TestManifestValuesApplicationIdSetsPackageName(t *testing.T) { ` - result := android.GroupFixturePreparers( - PrepareForTestWithJavaDefaultModules, - PrepareForTestWithOverlayBuildComponents, - ).RunTestWithBp(t, bp) + result := PrepareForTestWithJavaDefaultModules.RunTestWithBp(t, bp) manifestMergerRule := result.ModuleForTests("test", "android_common").Rule("manifestMerger") android.AssertStringMatches(t, |