summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2009-05-19 18:17:17 -0400
committerPatrick Scott <phanna@android.com>2009-05-20 14:11:35 -0400
commit11ad76caf9075b6feb3b310e4f5bad5bf0fe3192 (patch)
treee39e84539950871b195eb11edcf2c601f73ecbf6
parent539251f6b90c289d7e8f71fcffefe775dc5953a2 (diff)
downloadexternal_webkit-11ad76caf9075b6feb3b310e4f5bad5bf0fe3192.zip
external_webkit-11ad76caf9075b6feb3b310e4f5bad5bf0fe3192.tar.gz
external_webkit-11ad76caf9075b6feb3b310e4f5bad5bf0fe3192.tar.bz2
Use LOCAL_ADDITIONAL_DEPENDENCIES to get the correct build order.
This change depends on a build system change that corrects the use of LOCAL_ADDITIONAL_DEPENDENCIES.
-rw-r--r--perf/Android.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/perf/Android.mk b/perf/Android.mk
index 59aa177..ce84e37 100644
--- a/perf/Android.mk
+++ b/perf/Android.mk
@@ -45,11 +45,8 @@ LOCAL_MODULE := webcore_test
# 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_ADDITIONAL_DEPENDENCIES := $(filter %.h, $(WEBKIT_GENERATED_SOURCES))
LOCAL_MODULE_TAGS := tests
include $(BUILD_EXECUTABLE)
-