diff options
| author | Steve Block <steveblock@google.com> | 2011-05-06 11:45:16 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-12 13:44:10 +0100 |
| commit | cad810f21b803229eb11403f9209855525a25d57 (patch) | |
| tree | 29a6fd0279be608e0fe9ffe9841f722f0f4e4269 /Android.mk | |
| parent | 121b0cf4517156d0ac5111caf9830c51b69bae8f (diff) | |
| download | external_webkit-cad810f21b803229eb11403f9209855525a25d57.zip external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.gz external_webkit-cad810f21b803229eb11403f9209855525a25d57.tar.bz2 | |
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 80 |
1 files changed, 80 insertions, 0 deletions
@@ -161,6 +161,7 @@ LOCAL_C_INCLUDES := \ frameworks/base/include LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ +<<<<<<< HEAD $(WEBCORE_PATH) \ $(WEBCORE_PATH)/accessibility \ $(WEBCORE_PATH)/bindings/ \ @@ -223,6 +224,47 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBCORE_PATH)/websockets \ $(WEBCORE_PATH)/workers \ $(WEBCORE_PATH)/xml +======= + $(LOCAL_PATH)/Source/WebCore \ + $(LOCAL_PATH)/Source/WebCore/accessibility \ + $(LOCAL_PATH)/Source/WebCore/bindings/generic \ + $(LOCAL_PATH)/Source/WebCore/css \ + $(LOCAL_PATH)/Source/WebCore/dom \ + $(LOCAL_PATH)/Source/WebCore/editing \ + $(LOCAL_PATH)/Source/WebCore/history \ + $(LOCAL_PATH)/Source/WebCore/history/android \ + $(LOCAL_PATH)/Source/WebCore/html \ + $(LOCAL_PATH)/Source/WebCore/html/canvas \ + $(LOCAL_PATH)/Source/WebCore/inspector \ + $(LOCAL_PATH)/Source/WebCore/loader \ + $(LOCAL_PATH)/Source/WebCore/loader/appcache \ + $(LOCAL_PATH)/Source/WebCore/loader/icon \ + $(LOCAL_PATH)/Source/WebCore/notifications \ + $(LOCAL_PATH)/Source/WebCore/page \ + $(LOCAL_PATH)/Source/WebCore/page/android \ + $(LOCAL_PATH)/Source/WebCore/page/animation \ + $(LOCAL_PATH)/Source/WebCore/platform \ + $(LOCAL_PATH)/Source/WebCore/platform/android \ + $(LOCAL_PATH)/Source/WebCore/platform/animation \ + $(LOCAL_PATH)/Source/WebCore/platform/graphics \ + $(LOCAL_PATH)/Source/WebCore/platform/graphics/android \ + $(LOCAL_PATH)/Source/WebCore/platform/graphics/network \ + $(LOCAL_PATH)/Source/WebCore/platform/graphics/skia \ + $(LOCAL_PATH)/Source/WebCore/platform/graphics/transforms \ + $(LOCAL_PATH)/Source/WebCore/platform/image-decoders \ + $(LOCAL_PATH)/Source/WebCore/platform/mock \ + $(LOCAL_PATH)/Source/WebCore/platform/network \ + $(LOCAL_PATH)/Source/WebCore/platform/network/android \ + $(LOCAL_PATH)/Source/WebCore/platform/sql \ + $(LOCAL_PATH)/Source/WebCore/platform/text \ + $(LOCAL_PATH)/Source/WebCore/plugins \ + $(LOCAL_PATH)/Source/WebCore/plugins/android \ + $(LOCAL_PATH)/Source/WebCore/rendering \ + $(LOCAL_PATH)/Source/WebCore/rendering/style \ + $(LOCAL_PATH)/Source/WebCore/storage \ + $(LOCAL_PATH)/Source/WebCore/workers \ + $(LOCAL_PATH)/Source/WebCore/xml +>>>>>>> webkit.org at r75315 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBKIT_PATH)/android \ @@ -232,6 +274,7 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBKIT_PATH)/android/plugins LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ +<<<<<<< HEAD $(JAVASCRIPTCORE_PATH) \ $(JAVASCRIPTCORE_PATH)/wtf \ $(JAVASCRIPTCORE_PATH)/wtf/unicode \ @@ -242,10 +285,23 @@ LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ $(WEBCORE_INTERMEDIATES_PATH)/css \ $(WEBCORE_INTERMEDIATES_PATH)/html \ $(WEBCORE_INTERMEDIATES_PATH)/platform +======= + $(LOCAL_PATH)/Source/JavaScriptCore \ + $(LOCAL_PATH)/Source/JavaScriptCore/wtf \ + $(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode \ + $(LOCAL_PATH)/Source/JavaScriptCore/wtf/unicode/icu + +LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ + $(base_intermediates)/Source/WebCore/ \ + $(base_intermediates)/Source/WebCore/css \ + $(base_intermediates)/Source/WebCore/html \ + $(base_intermediates)/Source/WebCore/platform +>>>>>>> webkit.org at r75315 # The following includes are needed by the AutoFill feature, or the chrome http # stack LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ +<<<<<<< HEAD $(WEBKIT_PATH)/chromium \ $(WEBKIT_PATH)/chromium/public \ external/chromium/chrome/browser \ @@ -258,6 +314,20 @@ ifeq ($(JAVASCRIPT_ENGINE),v8) # Include WTF source file. d := JavaScriptCore LOCAL_PATH := $(JAVASCRIPTCORE_PATH) +======= + $(LOCAL_PATH)/Source/WebCore/platform/graphics/filters \ + $(LOCAL_PATH)/Source/WebCore/svg \ + $(LOCAL_PATH)/Source/WebCore/svg/animation \ + $(LOCAL_PATH)/Source/WebCore/svg/graphics \ + $(LOCAL_PATH)/Source/WebCore/svg/graphics/filters \ + $(base_intermediates)/Source/WebCore/svg +endif + +ifeq ($(JAVASCRIPT_ENGINE),v8) +# Include WTF source file. +d := Source/JavaScriptCore +LOCAL_PATH := $(BASE_PATH)/$d +>>>>>>> webkit.org at r75315 intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.v8.wtf.mk WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) @@ -265,7 +335,12 @@ endif # JAVASCRIPT_ENGINE == v8 # Include source files for WebCore d := WebCore +<<<<<<< HEAD LOCAL_PATH := $(WEBCORE_PATH) +======= +LOCAL_PATH := $(BASE_PATH)/$d +JAVASCRIPTCORE_PATH := $(BASE_PATH)/Source/JavaScriptCore +>>>>>>> webkit.org at r75315 intermediates := $(base_intermediates)/$d include $(LOCAL_PATH)/Android.mk ifeq ($(JAVASCRIPT_ENGINE),jsc) @@ -432,8 +507,13 @@ LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES) LOCAL_CFLAGS := $(WEBKIT_CFLAGS) # Include source files for JavaScriptCore +<<<<<<< HEAD d := JavaScriptCore LOCAL_PATH := $(JAVASCRIPTCORE_PATH) +======= +d := Source/JavaScriptCore +LOCAL_PATH := $(BASE_PATH)/$d +>>>>>>> webkit.org at r75315 LOCAL_MODULE_CLASS := STATIC_LIBRARIES # Cannot use base_intermediates as this is a new module intermediates := $(call local-intermediates-dir) |