From d5ebfb752a3d99d7d0cce3014bc4ed6db27710d1 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Thu, 3 Mar 2022 16:25:53 +0000 Subject: 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 --- build/art.go | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'build/art.go') 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) { -- cgit v1.2.3-59-g8ed1b