Merge changes Id749f453,Ie3ce9dd8
* changes:
Always run oatdumps tests
Disable oatdumps device build
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
}
diff --git a/oatdump/Android.bp b/oatdump/Android.bp
index ff56ea5..dd6331c 100644
--- a/oatdump/Android.bp
+++ b/oatdump/Android.bp
@@ -53,6 +53,7 @@
art_cc_binary {
name: "oatdumps",
defaults: ["oatdump-defaults"],
+ device_supported: false,
target: {
darwin: {
enabled: false,
@@ -73,6 +74,7 @@
"art_debug_defaults",
"oatdump-defaults",
],
+ device_supported: false,
target: {
darwin: {
enabled: false,
diff --git a/runtime/globals.h b/runtime/globals.h
index 691bf55..28534e4 100644
--- a/runtime/globals.h
+++ b/runtime/globals.h
@@ -85,9 +85,9 @@
# endif
#endif
-// Are additional statically-linked ART host binaries (dex2oats,
-// oatdumps, etc.) built and available?
-#if !defined(ART_TARGET) && defined(ART_BUILD_HOST_STATIC)
+// Additional statically-linked ART binaries (dex2oats, oatdumps, etc.) are
+// always available on the host
+#if !defined(ART_TARGET)
static constexpr bool kHostStaticBuildEnabled = true;
#else
static constexpr bool kHostStaticBuildEnabled = false;