diff options
| -rw-r--r-- | build/Android.gtest.mk | 3 | ||||
| -rw-r--r-- | build/art.go | 6 | ||||
| -rw-r--r-- | oatdump/Android.bp | 2 | ||||
| -rw-r--r-- | runtime/globals.h | 6 |
4 files changed, 7 insertions, 10 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index a71aec1c8f..c70f005878 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -177,7 +177,8 @@ ART_GTEST_imgdiag_test_TARGET_DEPS := \ 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 8266b087c5..ba5521a9ae 100644 --- a/build/art.go +++ b/build/art.go @@ -72,12 +72,6 @@ func globalFlags(ctx android.BaseContext) ([]string, []string) { 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 ff56ea548d..dd6331c24b 100644 --- a/oatdump/Android.bp +++ b/oatdump/Android.bp @@ -53,6 +53,7 @@ art_cc_binary { art_cc_binary { name: "oatdumps", defaults: ["oatdump-defaults"], + device_supported: false, target: { darwin: { enabled: false, @@ -73,6 +74,7 @@ art_cc_binary { "art_debug_defaults", "oatdump-defaults", ], + device_supported: false, target: { darwin: { enabled: false, diff --git a/runtime/globals.h b/runtime/globals.h index 691bf55d42..28534e4708 100644 --- a/runtime/globals.h +++ b/runtime/globals.h @@ -85,9 +85,9 @@ static constexpr bool kIsTargetLinux = false; # 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; |