ART: Remove hidden metricslogger dependencies
Removes workarounds for Linux-on-ARM in benchmarking on go/lem.
Bug: 79671158
Bug: 119217680
Test: art/tools/buildbot-build.sh --host -j100
Test: art/tools/buildbot-build.sh --target -j100
Test: art/tools/golem/build-target.sh --machine-type=linux-armv7 --golem=art-jit
Change-Id: Ifa1075e4f44b1b7bb26f32090544571cf97a7ead
diff --git a/build/art.go b/build/art.go
index 22f6410..5236e31 100644
--- a/build/art.go
+++ b/build/art.go
@@ -348,26 +348,7 @@
func libartDefaultsFactory() android.Module {
c := &codegenProperties{}
module := cc.DefaultsFactory(c)
- android.AddLoadHook(module, func(ctx android.LoadHookContext) {
- codegen(ctx, c, true)
-
- type props struct {
- Target struct {
- Android struct {
- Shared_libs []string
- }
- }
- }
-
- p := &props{}
- // TODO: express this in .bp instead b/79671158
- if !envTrue(ctx, "ART_TARGET_LINUX") {
- p.Target.Android.Shared_libs = []string{
- "libmetricslogger",
- }
- }
- ctx.AppendProperties(p)
- })
+ android.AddLoadHook(module, func(ctx android.LoadHookContext) { codegen(ctx, c, true) })
return module
}
@@ -375,27 +356,7 @@
func libartStaticDefaultsFactory() android.Module {
c := &codegenProperties{}
module := cc.DefaultsFactory(c)
- android.AddLoadHook(module, func(ctx android.LoadHookContext) {
- codegen(ctx, c, true)
-
- type props struct {
- Target struct {
- Android struct {
- Static_libs []string
- }
- }
- }
-
- p := &props{}
- // TODO: express this in .bp instead b/79671158
- if !envTrue(ctx, "ART_TARGET_LINUX") {
- p.Target.Android.Static_libs = []string{
- "libmetricslogger",
- "libstatssocket",
- }
- }
- ctx.AppendProperties(p)
- })
+ android.AddLoadHook(module, func(ctx android.LoadHookContext) { codegen(ctx, c, true) })
return module
}