1 files changed, 18 insertions, 81 deletions
diff --git a/perf/Android.mk b/perf/Android.mk
index 2d7bd92..59aa177 100644
--- a/perf/Android.mk
+++ b/perf/Android.mk
@@ -32,87 +32,24 @@ LOCAL_SRC_FILES := \
 	MyJavaVM.cpp \
 	main.cpp
 
-WEBCORE := external/webkit/WebCore
-WEBKIT := external/webkit/WebKit
-JSC := external/webkit/JavaScriptCore
-
-LOCAL_CFLAGS += -include "WebCorePrefixAndroid.h"
-
-LOCAL_C_INCLUDES := \
-	$(JNI_H_INCLUDE) \
-	external/webkit \
-	external/icu4c/common \
-	external/libxml2/include \
-	external/skia/include/effects \
-	external/skia/include/images \
-	external/skia/include/ports \
-	external/skia/include/utils \
-	external/skia/src/ports \
-	external/sqlite/dist \
-	$(WEBKIT) \
-	$(WEBKIT)/android/stl \
-	$(WEBCORE) \
-	$(WEBCORE)/bindings/js \
-	$(WEBCORE)/bridge \
-	$(WEBCORE)/bridge/c \
-	$(WEBCORE)/bridge/jni \
-	$(WEBCORE)/css \
-	$(WEBCORE)/dom \
-	$(WEBCORE)/editing \
-	$(WEBCORE)/history \
-	$(WEBCORE)/html \
-	$(WEBCORE)/inspector \
-	$(WEBCORE)/loader \
-	$(WEBCORE)/loader/appcache \
-	$(WEBCORE)/loader/icon \
-	$(WEBCORE)/page \
-	$(WEBCORE)/page/android \
-	$(WEBCORE)/page/animation \
-	$(WEBCORE)/platform \
-	$(WEBCORE)/platform/android \
-	$(WEBCORE)/platform/animation \
-	$(WEBCORE)/platform/graphics \
-	$(WEBCORE)/platform/graphics/android \
-	$(WEBCORE)/platform/graphics/network \
-	$(WEBCORE)/platform/graphics/transforms \
-	$(WEBCORE)/platform/image-decoders \
-	$(WEBCORE)/platform/network \
-	$(WEBCORE)/platform/network/android \
-	$(WEBCORE)/platform/sql \
-	$(WEBCORE)/platform/text \
-	$(WEBCORE)/plugins \
-	$(WEBCORE)/rendering \
-	$(WEBCORE)/rendering/style \
-	$(WEBCORE)/storage \
-	$(WEBCORE)/xml \
-	$(WEBKIT)/android \
-	$(WEBKIT)/android/jni \
-	$(WEBKIT)/android/nav \
-	$(WEBKIT)/android/plugins \
-	$(WEBKIT)/android/WebCoreSupport \
-	$(JSC) \
-	$(JSC)/API \
-	$(JSC)/assembler \
-	$(JSC)/bytecode \
-	$(JSC)/bytecompiler \
-	$(JSC)/debugger \
-	$(JSC)/parser \
-	$(JSC)/jit \
-	$(JSC)/interpreter \
-	$(JSC)/pcre \
-	$(JSC)/profiler \
-	$(JSC)/runtime \
-	$(JSC)/wrec \
-	$(JSC)/wtf \
-	$(JSC)/wtf/unicode \
-	$(JSC)/wtf/unicode/icu \
-	$(JSC)/ForwardingHeaders \
-	$(base_intermediates)/WebCore/page \
-	$(call include-path-for, corecg graphics)
-
-LOCAL_SHARED_LIBRARIES := libwebcore
-
-LOCAL_MODULE:= webcore_test
+# Pull the webkit definitions from the base webkit makefile.
+LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES)
+LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES)
+LOCAL_LDLIBS := $(WEBKIT_LDLIBS)
+LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)
+LOCAL_CFLAGS := $(WEBKIT_CFLAGS)
+
+LOCAL_MODULE := webcore_test
+
+# Do this dependency by hand. The reason we have to do this is because the
+# headers that this program pulls in are generated during the build of webcore.
+# We make all of our object files depend on those files so that they are built
+# before we try to compile our sources.
+LOCAL_MODULE_CLASS := EXECUTABLES
+intermediates := $(call local-intermediates-dir)
+$(intermediates)/%.o : $(WEBKIT_GENERATED_SOURCES)
+
+LOCAL_MODULE_TAGS := tests
 
 include $(BUILD_EXECUTABLE)