summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-02-13 09:26:06 -0800
committerJohn Reck <jreck@google.com>2012-02-23 13:38:21 -0800
commit773979f92560dd1aead375c82fd75b584a141e5d (patch)
tree21b1b0aa26606a35493aad883559b55607ab8603 /Android.mk
parentb7db22cf52aade90ac9d1fb8eb2f2bf37b711b13 (diff)
downloadexternal_webkit-773979f92560dd1aead375c82fd75b584a141e5d.zip
external_webkit-773979f92560dd1aead375c82fd75b584a141e5d.tar.gz
external_webkit-773979f92560dd1aead375c82fd75b584a141e5d.tar.bz2
Support address detection
Change-Id: I88b6ebfb4c967e954a2420592a58af3ed188226d
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 1320fa8..e46cd93 100644
--- a/Android.mk
+++ b/Android.mk
@@ -193,6 +193,8 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
external/chromium/chrome \
external/skia
+LOCAL_CFLAGS += -DWEBKIT_IMPLEMENTATION=1
+
# Include WTF source file.
d := Source/JavaScriptCore
LOCAL_PATH := $(BASE_PATH)/$d
@@ -345,18 +347,20 @@ LOCAL_CPPFLAGS := $(WEBKIT_CPPFLAGS)
LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES)
LOCAL_PATH := $(BASE_PATH)
LOCAL_SRC_FILES := \
- Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
+ Source/WebKit/android/jni/WebCoreJniOnLoad.cpp \
+ Source/WebKit/chromium/src/android/WebDOMTextContentWalker.cpp \
+ Source/WebKit/chromium/src/android/WebHitTestInfo.cpp \
+ Source/WebKit/chromium/src/WebRange.cpp \
+ Source/WebKit/chromium/src/WebString.cpp
ifeq ($(ENABLE_AUTOFILL),true)
# AutoFill requires some cpp files from Chromium to link with
# libchromium_net. We cannot compile them into libchromium_net
# because they have cpp file extensions, not .cc.
-LOCAL_CFLAGS += -DWEBKIT_IMPLEMENTATION=1
LOCAL_SRC_FILES += \
Source/WebKit/android/WebCoreSupport/autofill/MainThreadProxy.cpp \
Source/WebKit/chromium/src/WebCString.cpp \
- Source/WebKit/chromium/src/WebRegularExpression.cpp \
- Source/WebKit/chromium/src/WebString.cpp
+ Source/WebKit/chromium/src/WebRegularExpression.cpp
endif
# Do this dependency by hand. The reason we have to do this is because the