Always run oatdumps tests
ART_BUILD_HOST_STATIC is meaningless now, the static tools are always
available. Add oatdumpds as a dependency of the host oatdump tests, and
always enable the oatdump static tests.
Test: m -j test-art-host-gtest-oatdump_test
Change-Id: Id749f453f82489dc81a2c9042d3cc3120ea3d308
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index a71aec1..c70f005 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -177,7 +177,8 @@
ART_GTEST_oatdump_test_HOST_DEPS := \
$(HOST_CORE_IMAGE_optimizing_no-pic_64) \
$(HOST_CORE_IMAGE_optimizing_no-pic_32) \
- $(HOST_OUT_EXECUTABLES)/oatdumpd
+ $(HOST_OUT_EXECUTABLES)/oatdumpd \
+ $(HOST_OUT_EXECUTABLES)/oatdumpds
ART_GTEST_oatdump_test_TARGET_DEPS := \
$(TARGET_CORE_IMAGE_optimizing_no-pic_64) \
$(TARGET_CORE_IMAGE_optimizing_no-pic_32) \
diff --git a/build/art.go b/build/art.go
index 8266b08..ba5521a 100644
--- a/build/art.go
+++ b/build/art.go
@@ -72,12 +72,6 @@
cflags = append(cflags, "-fstack-protector")
}
- // Are additional statically-linked ART host binaries
- // (dex2oats, oatdumps, etc.) getting built?
- if envTrue(ctx, "ART_BUILD_HOST_STATIC") {
- cflags = append(cflags, "-DART_BUILD_HOST_STATIC=1")
- }
-
return cflags, asflags
}