Merge "Failure to create/find the art-cache directory should be fatal." into dalvik-dev
diff --git a/build/Android.executable.mk b/build/Android.executable.mk
index ff6ad17..3311b99 100644
--- a/build/Android.executable.mk
+++ b/build/Android.executable.mk
@@ -44,7 +44,6 @@
LOCAL_CFLAGS += $(ART_TARGET_DEBUG_CFLAGS)
else
LOCAL_CFLAGS += $(ART_HOST_DEBUG_CFLAGS)
- LOCAL_STATIC_LIBRARIES := libgtest_host
endif
endif
LOCAL_C_INCLUDES += $(ART_C_INCLUDES)
diff --git a/build/Android.test.mk b/build/Android.test.mk
index 6e82b26..531c775 100644
--- a/build/Android.test.mk
+++ b/build/Android.test.mk
@@ -37,7 +37,7 @@
else
LOCAL_CFLAGS := $(ART_HOST_CFLAGS) $(ART_HOST_DEBUG_CFLAGS)
LOCAL_SHARED_LIBRARIES += libicuuc-host libicui18n-host libnativehelper libz-host
- LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_host libgtest_main_host
+ LOCAL_WHOLE_STATIC_LIBRARIES := libgtest_main_host
endif
ifeq ($(1),target)
include $(BUILD_EXECUTABLE)