Remove framework-minus-apex_jarjar-sharded
This module was only for verifying the sharded version locally.
Now that the sharding has been enabled on f-m-a for a while with no
issues, we no longer need it.
Fix: 383559945
Flag: EXEMPT The module in question isn't used. It was only for local testing.
Test: Treehugger
Change-Id: I68b743cb04a972884dad5b5e8f581f541a68ce73
diff --git a/android/container.go b/android/container.go
index 99e6a30..830d474 100644
--- a/android/container.go
+++ b/android/container.go
@@ -198,9 +198,7 @@
func determineUnstableModule(mctx ModuleContext) bool {
module := mctx.Module()
- // TODO(b/383559945) Remove "framework-minus-apex_jarjar-sharded" once
- // we remove this module.
- unstableModule := module.Name() == "framework-minus-apex" || module.Name() == "framework-minus-apex_jarjar-sharded"
+ unstableModule := module.Name() == "framework-minus-apex"
if installable, ok := module.(InstallableModule); ok {
for _, staticDepTag := range installable.StaticDependencyTags() {
mctx.VisitDirectDepsWithTag(staticDepTag, func(dep Module) {
diff --git a/java/config/config.go b/java/config/config.go
index 19d6952..7c29722 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -42,9 +42,6 @@
InstrumentFrameworkModules = []string{
"framework",
"framework-minus-apex",
- // TODO(b/383559945) Remove "framework-minus-apex_jarjar-sharded" once
- // we remove this module.
- "framework-minus-apex_jarjar-sharded",
"ims-common",
"telephony-common",
"services",
diff --git a/java/legacy_core_platform_api_usage.go b/java/legacy_core_platform_api_usage.go
index 6128ce3..4be7d04 100644
--- a/java/legacy_core_platform_api_usage.go
+++ b/java/legacy_core_platform_api_usage.go
@@ -28,9 +28,6 @@
"FloralClocks",
"framework-jobscheduler",
"framework-minus-apex",
- // TODO(b/383559945) Remove "framework-minus-apex_jarjar-sharded" once
- // we remove this module.
- "framework-minus-apex_jarjar-sharded",
"framework-minus-apex-headers",
"framework-minus-apex-intdefs",
"FrameworksCoreTests",