summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorFeng Qian <fqian@google.com>2009-04-21 14:39:59 -0700
committerFeng Qian <fqian@google.com>2009-04-21 14:39:59 -0700
commitc1d9ea761026318d54ee5b6e086021bdaceb4ddc (patch)
tree63037ac78cb060a57b66187e50eaeb052eba4312 /Android.mk
parentba8f92f666d8cdf3f6bdbe4b53d214fade995b74 (diff)
downloadexternal_webkit-c1d9ea761026318d54ee5b6e086021bdaceb4ddc.zip
external_webkit-c1d9ea761026318d54ee5b6e086021bdaceb4ddc.tar.gz
external_webkit-c1d9ea761026318d54ee5b6e086021bdaceb4ddc.tar.bz2
Move WTF files into Android.wtf.mk
This file can be shared by both JavaScriptCore and V8 builds.
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 0de1393..4e11064 100644
--- a/Android.mk
+++ b/Android.mk
@@ -63,10 +63,16 @@ include $(LOCAL_PATH)/V8Binding.derived.mk
WEBKIT_SRC_FILES += $(addprefix $d/, $(LOCAL_SRC_FILES))
WEBKIT_SRC_FILES += $(addprefix WebCore/, $(webcore_src_files))
+endif
+
+
+# Include WTF source file.
+d := JavaScriptCore
+LOCAL_PATH := $(BASE_PATH)/$d
+intermediates := $(base_intermediates)/$d
include $(LOCAL_PATH)/wtf.mk
-WEBKIT_SRC_FILES += $(addprefix JavaScriptCore/,$(LOCAL_SRC_FILES))
+WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
-endif
# Include source files for WebCore
d := WebCore