diff options
| author | 2025-01-06 10:41:32 -0800 | |
|---|---|---|
| committer | 2025-01-06 10:41:32 -0800 | |
| commit | e62022dc02fc6919de9e1b31e6e6a73d2f77b3a9 (patch) | |
| tree | b976ebd43f0baaaaa4f4e27cc628f695cf84788b | |
| parent | 5a4f022c9d8fed286e891fb77b3ab2d59138aafa (diff) | |
| parent | f3d66a3d5d14219f033b1265946fa5fe7685dd5f (diff) | |
Merge "Remove framework-minus-apex_jarjar-sharded" into main
| -rw-r--r-- | android/container.go | 4 | ||||
| -rw-r--r-- | java/config/config.go | 3 | ||||
| -rw-r--r-- | java/legacy_core_platform_api_usage.go | 3 |
3 files changed, 1 insertions, 9 deletions
diff --git a/android/container.go b/android/container.go index 99e6a3075..830d474e9 100644 --- a/android/container.go +++ b/android/container.go @@ -198,9 +198,7 @@ var unstableInfoProvider = blueprint.NewProvider[unstableInfo]() 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 19d695291..7c29722a2 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -42,9 +42,6 @@ var ( 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 6128ce3df..4be7d0470 100644 --- a/java/legacy_core_platform_api_usage.go +++ b/java/legacy_core_platform_api_usage.go @@ -28,9 +28,6 @@ var legacyCorePlatformApiModules = []string{ "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", |