Changeset 51926 in webkit


Ignore:
Timestamp:
Dec 9, 2009 2:47:04 PM (14 years ago)
Author:
eric@webkit.org
Message:

2009-12-09 Steve Block <​steveblock@google.com>

Reviewed by Adam Barth.

Adds Android Makefiles for building with V8.
​https://bugs.webkit.org/show_bug.cgi?id=32278

  • Android.mk: Modified. Includes Makefiles for V8.

2009-12-09 Steve Block <​steveblock@google.com>

Reviewed by Adam Barth.

Updates Android Makefiles with latest additions.
​https://bugs.webkit.org/show_bug.cgi?id=32278

  • Android.mk: Modified.
  • Android.v8.wtf.mk: Modified.

2009-12-09 Steve Block <​steveblock@google.com>

Reviewed by Adam Barth.

Adds Android Makefiles for building with V8.
Also updates existing Android Makefiles with latest additions.
​https://bugs.webkit.org/show_bug.cgi?id=32278

Build fix only, no new tests.

  • Android.derived.jscbindings.mk: Modified.
  • Android.derived.mk: Modified.
  • Android.derived.v8bindings.mk: Added.
  • Android.jscbindings.mk: Modified.
  • Android.mk: Modified.
  • Android.v8bindings.mk: Added.
Location:
trunk
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Android.mk

    r51858 r51926  
    6464
    6565ifeq ($(JAVASCRIPT_ENGINE),v8)
    66 d := V8Binding
    67 LOCAL_PATH := $(BASE_PATH)/$d
    68 WEBCORE_PATH := $(BASE_PATH)/WebCore
    69 intermediates := $(base_intermediates)/WebCore
    70 JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
    71 include $(LOCAL_PATH)/V8Binding.derived.mk
    72 WEBKIT_SRC_FILES += $(addprefix $d/, $(LOCAL_SRC_FILES))
    73 WEBKIT_SRC_FILES += $(addprefix WebCore/, $(WEBCORE_SRC_FILES))
    74 
    7566# Include WTF source file.
    7667d := JavaScriptCore
    … …  
    8475d := WebCore
    8576LOCAL_PATH := $(BASE_PATH)/$d
     77JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore
    8678intermediates := $(base_intermediates)/$d
    8779include $(LOCAL_PATH)/Android.mk
    … …  
    8981include $(LOCAL_PATH)/Android.jscbindings.mk
    9082endif
     83ifeq ($(JAVASCRIPT_ENGINE),v8)
     84include $(LOCAL_PATH)/Android.v8bindings.mk
     85endif
    9186WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
     87LOCAL_C_INCLUDES := $(BINDING_C_INCLUDES)
    9288
    9389# Include the derived source files for WebCore. Uses the same path as
    … …  
    9793include $(LOCAL_PATH)/Android.derived.jscbindings.mk
    9894endif
    99 WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES))
     95ifeq ($(JAVASCRIPT_ENGINE),v8)
     96include $(LOCAL_PATH)/Android.derived.v8bindings.mk
     97endif
    10098
    10199# Redefine LOCAL_PATH here so the build system is not confused
    … …  
    133131# also add external/ as an include directory so that we can specify the real
    134132# icu header directory as a more exact reference to avoid including our ucnv.h.
    135 LOCAL_C_INCLUDES := \
     133#
     134# Note that JavasCriptCore/ must be included after WebCore/, so that we pick up
     135# the right config.h.
     136LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    136137        $(JNI_H_INCLUDE) \
    137138        $(LOCAL_PATH)/WebKit/android/icu \
    … …  
    149150        external/sqlite/dist \
    150151        frameworks/base/core/jni/android/graphics
    151 ifeq ($(JAVASCRIPT_ENGINE),v8)
    152 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    153         external/v8/include
    154 endif
    155152
    156153LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    … …  
    161158        $(LOCAL_PATH)/WebCore/editing \
    162159        $(LOCAL_PATH)/WebCore/history \
     160        $(LOCAL_PATH)/WebCore/history/android \
    163161        $(LOCAL_PATH)/WebCore/html \
    164162        $(LOCAL_PATH)/WebCore/html/canvas \
    … …  
    192190        $(LOCAL_PATH)/WebCore/workers \
    193191        $(LOCAL_PATH)/WebCore/xml
    194 ifeq ($(JAVASCRIPT_ENGINE),jsc)
    195 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    196         $(LOCAL_PATH)/WebCore/bindings/js \
    197         $(LOCAL_PATH)/WebCore/bridge \
    198         $(LOCAL_PATH)/WebCore/bridge/c \
    199         $(LOCAL_PATH)/WebCore/bridge/jni
    200 endif
    201192
    202193LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    … …  
    209200
    210201LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
     202        $(LOCAL_PATH)/JavaScriptCore \
    211203        $(LOCAL_PATH)/JavaScriptCore/wtf \
    212204        $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \
    213205        $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu
    214 ifeq ($(JAVASCRIPT_ENGINE),jsc)
    215 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    216         $(LOCAL_PATH)/JavaScriptCore \
    217         $(LOCAL_PATH)/JavaScriptCore/API \
    218         $(LOCAL_PATH)/JavaScriptCore/assembler \
    219         $(LOCAL_PATH)/JavaScriptCore/bytecode \
    220         $(LOCAL_PATH)/JavaScriptCore/bytecompiler \
    221         $(LOCAL_PATH)/JavaScriptCore/debugger \
    222         $(LOCAL_PATH)/JavaScriptCore/parser \
    223         $(LOCAL_PATH)/JavaScriptCore/jit \
    224         $(LOCAL_PATH)/JavaScriptCore/interpreter \
    225         $(LOCAL_PATH)/JavaScriptCore/pcre \
    226         $(LOCAL_PATH)/JavaScriptCore/profiler \
    227         $(LOCAL_PATH)/JavaScriptCore/runtime \
    228         $(LOCAL_PATH)/JavaScriptCore/wrec \
    229         $(LOCAL_PATH)/JavaScriptCore/ForwardingHeaders
    230 endif
    231206
    232207LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    … …  
    235210        $(base_intermediates)/WebCore/html \
    236211        $(base_intermediates)/WebCore/platform
    237 ifeq ($(JAVASCRIPT_ENGINE),jsc)
    238 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    239         $(base_intermediates)/WebCore/bindings/js \
    240         $(base_intermediates)/WebCore/dom \
    241         $(base_intermediates)/WebCore/html/canvas \
    242         $(base_intermediates)/WebCore/inspector \
    243         $(base_intermediates)/WebCore/loader/appcache \
    244         $(base_intermediates)/WebCore/page \
    245         $(base_intermediates)/WebCore/plugins \
    246         $(base_intermediates)/WebCore/storage \
    247         $(base_intermediates)/WebCore/workers \
    248         $(base_intermediates)/WebCore/xml
    249 endif
    250 ifeq ($(JAVASCRIPT_ENGINE),v8)
    251 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    252         $(base_intermediates)/WebCore/bindings \
    253         $(base_intermediates)/JavaScriptCore
    254 endif
    255 
    256 ifeq ($(JAVASCRIPT_ENGINE),v8)
    257 LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \
    258         $(BINDING_C_INCLUDES)
    259 endif
    260212
    261213ifeq ($(ENABLE_SVG), true)

  • trunk/ChangeLog

    r51858 r51926  
     12009-12-09  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        Adds Android Makefiles for building with V8.
     6        https://bugs.webkit.org/show_bug.cgi?id=32278
     7
     8        * Android.mk: Modified. Includes Makefiles for V8.
     9
    1102009-12-08  Steve Block  <steveblock@google.com>
    211

  • trunk/JavaScriptCore/Android.mk

    r51882 r51926  
    168168        wtf/dtoa.cpp \
    169169        \
     170        wtf/android/MainThreadAndroid.cpp \
     171        \
    170172        wtf/unicode/CollatorDefault.cpp \
    171173        wtf/unicode/UTF8.cpp \

  • trunk/JavaScriptCore/Android.v8.wtf.mk

    r51858 r51926  
    4646        wtf/ThreadingPthreads.cpp \
    4747        \
     48        wtf/android/MainThreadAndroid.cpp \
     49        \
    4850        wtf/TypeTraits.cpp \
    4951        wtf/dtoa.cpp \

  • trunk/JavaScriptCore/ChangeLog

    r51914 r51926  
     12009-12-09  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        Updates Android Makefiles with latest additions.
     6        https://bugs.webkit.org/show_bug.cgi?id=32278
     7
     8        * Android.mk: Modified.
     9        * Android.v8.wtf.mk: Modified.
     10
    1112009-12-09  Sam Weinig  <sam@webkit.org>
    212

  • trunk/WebCore/Android.derived.jscbindings.mk

    r51858 r51926  
    5050                )
    5151
    52 FEATURE_DEFINES := ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1
    53 
     52FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 ENABLE_DOM_STORAGE=1 ENABLE_VIDEO=1 ENABLE_WORKERS=1 ENABLE_GEOLOCATION=1 ENABLE_CHANNEL_MESSAGING=1
     53
     54# CSS
    5455GEN := \
    5556    $(intermediates)/css/JSCSSCharsetRule.h \
    … …  
    9192$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/css/%.cpp : $(intermediates)/css/%.h
    9293
    93 # MANUAL MERGE : I took this out because compiling the result shows:
    94 # out/.../JSEventTarget.cpp: In function 'JSC::JSValue* WebCore::jsEventTargetPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue*, const JSC::ArgList&)':
    95 # out/.../JSEventTarget.cpp:90: error: 'toEventListener' was not declared in this scope
    96 # but I can't find toEventListener anywhere, nor can I figure out how toEventListener
    97 # is generated
    98 #    $(intermediates)/dom/JSEventTarget.h \
    99 
     94# DOM
    10095GEN := \
    10196    $(intermediates)/dom/JSAttr.h \
    … …  
    153148$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/%.h
    154149
    155 
     150# HTML
    156151GEN := \
    157152    $(intermediates)/html/JSDataGridColumn.h \
    … …  
    246241$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/html/%.h
    247242
     243# Canvas
    248244GEN := \
    249245    $(intermediates)/html/canvas/JSCanvasGradient.h \
    … …  
    263259$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/canvas/%.cpp : $(intermediates)/html/canvas/%.h
    264260
     261# Appcache
    265262GEN := \
    266263    $(intermediates)/loader/appcache/JSDOMApplicationCache.h
    … …  
    276273$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/loader/appcache/%.cpp : $(intermediates)/loader/appcache/%.h
    277274
    278 # MANUAL MERGE : I took this out because compiling the result shows:
    279 # out/.../JSAbstractView.cpp:27:26: error: AbstractView.h: No such file or directory
    280 # I can't find AbstractView.h anywhere
    281 #    $(intermediates)/page/JSAbstractView.h \
    282 
     275# page
    283276GEN := \
    284277    $(intermediates)/page/JSBarInfo.h \
    … …  
    323316$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/plugins/%.h
    324317
    325 # New section for Database storage API
     318# Database
    326319GEN := \
    327320    $(intermediates)/storage/JSDatabase.h \
    … …  
    341334$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
    342335
    343 # new section for DOM Storage APIs
     336# DOM Storage
    344337GEN := \
    345338    $(intermediates)/storage/JSStorage.h \
    … …  
    356349$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h
    357350
    358 #new section for svg
     351# SVG
    359352ifeq ($(ENABLE_SVG), true)
    360353GEN := \
    … …  
    502495endif
    503496
    504 # new section for Workers
     497# Workers
    505498GEN := \
    506499    $(intermediates)/workers/JSAbstractWorker.h \
    … …  
    522515$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/workers/%.cpp : $(intermediates)/workers/%.h
    523516
    524 #new section for xml/DOMParser.idl
     517# XML
    525518GEN := \
    526519    $(intermediates)/xml/JSDOMParser.h \
    … …  
    546539GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp  $(intermediates)/JSHTMLElementWrapperFactory.cpp
    547540$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
    548 $(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(html_tags) --attrs $(html_attrs)  --extraDefines "$(FEATURE_DEFINES)" --factory --wrapperFactory --output $(dir $@)
    549 $(GEN): html_tags := $(LOCAL_PATH)/html/HTMLTagNames.in
    550 $(GEN): html_attrs := $(LOCAL_PATH)/html/HTMLAttributeNames.in
    551 $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(html_tags) $(html_attrs)
     541$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/html/HTMLTagNames.in --attrs $(PRIVATE_PATH)/html/HTMLAttributeNames.in --extraDefines "$(FEATURE_DEFINES)" --factory --wrapperFactory --output $(dir $@)
     542$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/html/HTMLTagNames.in $(LOCAL_PATH)/html/HTMLAttributeNames.in
    552543        $(transform-generated-source)
    553544LOCAL_GENERATED_SOURCES += $(GEN)
    … …  
    559550SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1
    560551$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
    561 $(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(svg_tags) --attrs $(svg_attrs) --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@)
    562 $(GEN): svg_tags := $(LOCAL_PATH)/svg/svgtags.in
    563 $(GEN): svg_attrs := $(LOCAL_PATH)/svg/svgattrs.in
    564 $(GEN): $(LOCAL_PATH)/dom/make_names.pl $(svg_tags) $(svg_attrs)
     552$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(PRIVATE_PATH)/svg/svgtags.in --attrs $(PRIVATE_PATH)/svg/svgattrs.in --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@)
     553$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(LOCAL_PATH)/svg/svgtags.in $(LOCAL_PATH)/svg/svgattrs.in
    565554        $(transform-generated-source)
    566555LOCAL_GENERATED_SOURCES += $(GEN)

  • trunk/WebCore/Android.derived.mk

    r51858 r51926  
    2424##
    2525
    26 LOCAL_SRC_FILES :=
    2726# CSS property names and value keywords
    2827
    … …  
    102101LOCAL_GENERATED_SOURCES += $(GEN)
    103102
    104 # XPath grammar
    105 
    106 GEN := $(intermediates)/XPathGrammar.cpp
    107 $(GEN) : PRIVATE_YACCFLAGS := -p xpathyy
    108 $(GEN): $(LOCAL_PATH)/xml/XPathGrammar.y
    109         $(call local-transform-y-to-cpp,.cpp)
    110 $(GEN): $(LOCAL_BISON)
    111 
    112 LOCAL_GENERATED_SOURCES += $(GEN)
    113                                  
    114103# user agent style sheets
    115104

  • trunk/WebCore/Android.jscbindings.mk

    r51858 r51926  
    2323## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424##
     25
     26BINDING_C_INCLUDES := \
     27        $(LOCAL_PATH)/bindings/js \
     28        $(LOCAL_PATH)/bridge \
     29        $(LOCAL_PATH)/bridge/c \
     30        $(LOCAL_PATH)/bridge/jni \
     31        $(LOCAL_PATH)/bridge/jni/jsc \
     32        \
     33        $(JAVASCRIPTCORE_PATH)/API \
     34        $(JAVASCRIPTCORE_PATH)/assembler \
     35        $(JAVASCRIPTCORE_PATH)/bytecode \
     36        $(JAVASCRIPTCORE_PATH)/bytecompiler \
     37        $(JAVASCRIPTCORE_PATH)/debugger \
     38        $(JAVASCRIPTCORE_PATH)/parser \
     39        $(JAVASCRIPTCORE_PATH)/jit \
     40        $(JAVASCRIPTCORE_PATH)/interpreter \
     41        $(JAVASCRIPTCORE_PATH)/pcre \
     42        $(JAVASCRIPTCORE_PATH)/profiler \
     43        $(JAVASCRIPTCORE_PATH)/runtime \
     44        $(JAVASCRIPTCORE_PATH)/wrec \
     45        $(JAVASCRIPTCORE_PATH)/ForwardingHeaders \
     46        \
     47        $(base_intermediates)/WebCore/bindings/js \
     48        $(base_intermediates)/WebCore/dom \
     49        $(base_intermediates)/WebCore/html/canvas \
     50        $(base_intermediates)/WebCore/inspector \
     51        $(base_intermediates)/WebCore/loader/appcache \
     52        $(base_intermediates)/WebCore/page \
     53        $(base_intermediates)/WebCore/plugins \
     54        $(base_intermediates)/WebCore/storage \
     55        $(base_intermediates)/WebCore/workers \
     56        $(base_intermediates)/WebCore/xml
    2557
    2658LOCAL_SRC_FILES += \
    … …  
    158190        bridge/jni/jni_runtime.cpp \
    159191        bridge/jni/jni_utility.cpp \
     192        bridge/jni/jsc/jni_utility_private.cpp \
    160193        bridge/npruntime.cpp \
    161194        bridge/runtime.cpp \

  • trunk/WebCore/Android.mk

    r51902 r51926  
    233233        history/PageCache.cpp \
    234234        \
     235        history/android/HistoryItemAndroid.cpp \
     236        \
    235237        html/CollectionCache.cpp \
    236238        html/File.cpp \
    … …  
    390392        platform/android/FileChooserAndroid.cpp \
    391393        platform/android/FileSystemAndroid.cpp \
     394        platform/android/GeolocationServiceAndroid.cpp \
     395        platform/android/GeolocationServiceBridge.cpp \
    392396        platform/android/KeyEventAndroid.cpp \
    393397        platform/android/LocalizedStringsAndroid.cpp \
    … …  
    397401        platform/android/ScrollViewAndroid.cpp \
    398402        platform/android/SearchPopupMenuAndroid.cpp \
     403        platform/android/SharedTimerAndroid.cpp \
     404        platform/android/SoundAndroid.cpp \
     405        platform/android/SSLKeyGeneratorAndroid.cpp \
    399406        platform/android/SystemTimeAndroid.cpp \
    400407        platform/android/TemporaryLinkStubs.cpp \

  • trunk/WebCore/ChangeLog

    r51925 r51926  
     12009-12-09  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Adam Barth.
     4
     5        Adds Android Makefiles for building with V8.
     6        Also updates existing Android Makefiles with latest additions.
     7        https://bugs.webkit.org/show_bug.cgi?id=32278
     8
     9        Build fix only, no new tests.
     10
     11        * Android.derived.jscbindings.mk: Modified.
     12        * Android.derived.mk: Modified.
     13        * Android.derived.v8bindings.mk: Added.
     14        * Android.jscbindings.mk: Modified.
     15        * Android.mk: Modified.
     16        * Android.v8bindings.mk: Added.
     17
    1182009-12-09  Jonathan Dixon  <joth@chromium.org>
    219
Note: See TracChangeset for help on using the changeset viewer.