Revert "Make the enabled property configurable"
Revert submission 27162921-configurable_enabled_property
Reason for revert: Droid-monitor created revert due to Build breakage in b/338253720. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:27162921-configurable_enabled_property
Change-Id: I2d144f9d297373a13a1190b173d10c966181ad84
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 187e30b..3e284b1 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -5622,21 +5622,8 @@
compile_dex: true,
}
`
- // This test disables libbar, which causes the ComponentDepsMutator to add
- // deps on libbar.stubs and other sub-modules that don't exist. We can
- // enable AllowMissingDependencies to work around that, but enabling that
- // causes extra checks for missing source files to dex_bootjars, so add those
- // to the mock fs as well.
- preparer2 := android.GroupFixturePreparers(
- preparer,
- android.PrepareForTestWithAllowMissingDependencies,
- android.FixtureMergeMockFs(map[string][]byte{
- "build/soong/scripts/check_boot_jars/package_allowed_list.txt": nil,
- "frameworks/base/config/boot-profile.txt": nil,
- }),
- )
- ctx := testDexpreoptWithApexes(t, bp, "", preparer2, fragment)
+ ctx := testDexpreoptWithApexes(t, bp, "", preparer, fragment)
checkBootDexJarPath(t, ctx, "libfoo", "out/soong/.intermediates/prebuilt_myapex.deapexer/android_common/deapexer/javalib/libfoo.jar")
checkBootDexJarPath(t, ctx, "libbar", "out/soong/.intermediates/prebuilt_myapex.deapexer/android_common/deapexer/javalib/libbar.jar")
@@ -9254,7 +9241,7 @@
continue
}
mod := ctx.ModuleForTests(modName, variant).Module().(*cc.Module)
- if !mod.Enabled(android.PanickingConfigAndErrorContext(ctx)) || mod.IsHideFromMake() {
+ if !mod.Enabled() || mod.IsHideFromMake() {
continue
}
for _, ent := range android.AndroidMkEntriesForTest(t, ctx, mod) {