Remove art_apex and art_apex_test module type.

These types don't seem to be doing anything special since
https://android-review.googlesource.com/c/platform/art/+/1862813.

(credits to eakammer@ for discovering the code)

Test: CI
Change-Id: Ifb95e20c8471601dd877aac351040887ccaacf1e

2 files changed, 3 insertions, 15 deletions

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 20368e0225..880397a239 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -373,7 +373,7 @@ apex_test {
 // Release version of the ART APEX module (not containing debug
 // variants nor tools), included in user builds. Also used for
 // storage-constrained devices in userdebug and eng builds.
-art_apex {
+apex {
     name: "com.android.art",
     defaults: ["com.android.art-device-defaults"],
     certificate: ":com.android.art.certificate",
@@ -382,7 +382,7 @@ art_apex {
 // "Debug" version of the ART APEX module (containing both release and
 // debug variants, as well as additional tools), included in userdebug and
 // eng build.
-art_apex {
+apex {
     name: "com.android.art.debug",
     defaults: ["com.android.art-devel-defaults"],
     certificate: ":com.android.art.certificate",
@@ -418,7 +418,7 @@ art_gtests = [
 // "Testing" version of the ART APEX module (containing both release
 // and debug variants, additional tools, and ART gtests), for testing
 // purposes only.
-art_apex_test {
+apex_test {
     name: "com.android.art.testing",
     defaults: ["com.android.art-devel-defaults"],
     file_contexts: ":com.android.art.debug-file_contexts",
diff --git a/build/art.go b/build/art.go
index 01cb44a89c..79149503c5 100644
--- a/build/art.go
+++ b/build/art.go
@@ -356,10 +356,6 @@ func init() {
 	android.RegisterModuleType("art_global_defaults", artGlobalDefaultsFactory)
 	android.RegisterModuleType("art_debug_defaults", artDebugDefaultsFactory)
 
-	// ART apex is special because it must include dexpreopt files for bootclasspath jars.
-	android.RegisterModuleType("art_apex", artApexBundleFactory)
-	android.RegisterModuleType("art_apex_test", artTestApexBundleFactory)
-
 	// TODO: This makes the module disable itself for host if HOST_PREFER_32_BIT is
 	// set. We need this because the multilib types of binaries listed in the apex
 	// rule must match the declared type. This is normally not difficult but HOST_PREFER_32_BIT
@@ -369,14 +365,6 @@ func init() {
 	android.RegisterModuleType("art_apex_test_host", artHostTestApexBundleFactory)
 }
 
-func artApexBundleFactory() android.Module {
-	return apex.ApexBundleFactory(false)
-}
-
-func artTestApexBundleFactory() android.Module {
-	return apex.ApexBundleFactory(true)
-}
-
 func artHostTestApexBundleFactory() android.Module {
 	module := apex.ApexBundleFactory(true)
 	android.AddLoadHook(module, func(ctx android.LoadHookContext) {