summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jooyung Han <jooyung@google.com> 2023-09-11 15:46:23 +0900
committer Jooyung Han <jooyung@google.com> 2023-09-12 12:11:19 +0000
commit22eb6d8ed4b248133922cebe765267b4bb042fb8 (patch)
tree40c81642979952776f2028198917375036fa4095
parentb63b4a28ed2cdbfae75fb5e550313ce3ccec1eae (diff)
Remove unused module type: art_apex_test_host
Bug: 279835185 Test: m Change-Id: I8afa372e69ee5f61b3ba19fb95af5a3b9e3bcd52
-rw-r--r--build/art.go33
1 files changed, 0 insertions, 33 deletions
diff --git a/build/art.go b/build/art.go
index 848b1a4056..340b90de4f 100644
--- a/build/art.go
+++ b/build/art.go
@@ -16,7 +16,6 @@ package art
import (
"fmt"
- "log"
"path/filepath"
"strings"
"sync"
@@ -24,7 +23,6 @@ import (
"github.com/google/blueprint/proptools"
"android/soong/android"
- "android/soong/apex"
"android/soong/cc"
"android/soong/cc/config"
)
@@ -327,7 +325,6 @@ func init() {
"art_cc_test_library",
"art_cc_defaults",
"art_global_defaults",
- "art_apex_test_host",
}
android.AddNeverAllowRules(
android.NeverAllow().
@@ -341,36 +338,6 @@ func init() {
android.RegisterModuleType("art_cc_test_library", artTestLibrary)
android.RegisterModuleType("art_cc_defaults", artDefaultsFactory)
android.RegisterModuleType("art_global_defaults", artGlobalDefaultsFactory)
-
- // 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
- // changes this to 'prefer32' on all host binaries. Since HOST_PREFER_32_BIT is
- // only used for testing we can just disable the module.
- // See b/120617876 for more information.
- android.RegisterModuleType("art_apex_test_host", artHostTestApexBundleFactory)
-}
-
-func artHostTestApexBundleFactory() android.Module {
- module := apex.ApexBundleFactory(true)
- android.AddLoadHook(module, func(ctx android.LoadHookContext) {
- if ctx.Config().IsEnvTrue("HOST_PREFER_32_BIT") {
- type props struct {
- Target struct {
- Host struct {
- Enabled *bool
- }
- }
- }
-
- p := &props{}
- p.Target.Host.Enabled = proptools.BoolPtr(false)
- ctx.AppendProperties(p)
- log.Print("Disabling host build of " + ctx.ModuleName() + " for HOST_PREFER_32_BIT=true")
- }
- })
-
- return module
}
func artGlobalDefaultsFactory() android.Module {