diff options
| -rw-r--r-- | Android.jsc.mk | 255 | ||||
| -rw-r--r-- | Android.mk | 262 | ||||
| -rw-r--r-- | Android.v8.mk | 249 | ||||
| -rw-r--r-- | JavaScriptCore/Android.mk | 38 | ||||
| -rw-r--r-- | WebCore/Android.derived.mk | 540 | ||||
| -rw-r--r-- | WebCore/Android.mk | 144 | ||||
| -rw-r--r-- | WebCore/JavaScriptCore.derived.mk | 702 |
7 files changed, 1217 insertions, 973 deletions
diff --git a/Android.jsc.mk b/Android.jsc.mk new file mode 100644 index 0000000..7ad565a --- /dev/null +++ b/Android.jsc.mk @@ -0,0 +1,255 @@ +## +## +## Copyright 2007, The Android Open Source Project +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## + +BASE_PATH := $(call my-dir) +include $(CLEAR_VARS) + +# Define our module and find the intermediates directory +LOCAL_MODULE := libwebcore +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +base_intermediates := $(call local-intermediates-dir) + +# Using := here prevents recursive expansion +WEBKIT_SRC_FILES := + +# We have to use bison 2.3 +include $(BASE_PATH)/bison_check.mk + +# Include source files for JavaScriptCore +d := JavaScriptCore +LOCAL_PATH := $(BASE_PATH)/$d +intermediates := $(base_intermediates)/$d +include $(LOCAL_PATH)/Android.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Include source files for WebCore +d := WebCore +LOCAL_PATH := $(BASE_PATH)/$d +intermediates := $(base_intermediates)/$d +include $(LOCAL_PATH)/Android.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Include the derived source files for WebCore. Uses the same path as +# WebCore +include $(LOCAL_PATH)/Android.derived.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Include source files for android WebKit port +d := WebKit +LOCAL_PATH := $(BASE_PATH)/$d +intermediates := $(base_intermediates)/$d +include $(LOCAL_PATH)/Android.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Redefine LOCAL_PATH here so the build system is not confused +LOCAL_PATH := $(BASE_PATH) + +# Define our compiler flags +LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format +LOCAL_CFLAGS += -fno-strict-aliasing +LOCAL_CFLAGS += -include "WebCorePrefixAndroid.h" +LOCAL_CFLAGS += -fvisibility=hidden + +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -Darm +endif + +ifeq ($(ENABLE_SVG),true) +LOCAL_CFLAGS += -DENABLE_SVG=1 +endif + +# Temporary disable SVG_ANIMATION. +ifeq ($(ENABLE_SVG_ANIMATION),true) +LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1 +endif + +ifeq ($(WEBCORE_INSTRUMENTATION),true) +LOCAL_CFLAGS += -DANDROID_INSTRUMENT +endif + +# LOCAL_LDLIBS is used in simulator builds only and simulator builds are only +# valid on Linux +LOCAL_LDLIBS += -lpthread -ldl + +# Build our list of include paths. We include WebKit/android/icu first so that +# any files that include <unicode/ucnv.h> will include our ucnv.h first. We +# also add external/ as an include directory so that we can specify the real +# icu header directory as a more exact reference to avoid including our ucnv.h. +LOCAL_C_INCLUDES := \ + $(JNI_H_INCLUDE) \ + $(LOCAL_PATH)/WebKit/android/icu \ + external/ \ + external/icu4c/common \ + external/icu4c/i18n \ + external/libxml2/include \ + external/skia/emoji \ + external/skia/include/core \ + external/skia/include/effects \ + external/skia/include/images \ + external/skia/include/ports \ + external/skia/include/utils \ + external/skia/src/ports \ + external/sqlite/dist \ + frameworks/base/core/jni/android/graphics \ + $(LOCAL_PATH)/WebCore \ + $(LOCAL_PATH)/WebCore/bindings/js \ + $(LOCAL_PATH)/WebCore/bridge \ + $(LOCAL_PATH)/WebCore/bridge/c \ + $(LOCAL_PATH)/WebCore/bridge/jni \ + $(LOCAL_PATH)/WebCore/css \ + $(LOCAL_PATH)/WebCore/dom \ + $(LOCAL_PATH)/WebCore/editing \ + $(LOCAL_PATH)/WebCore/history \ + $(LOCAL_PATH)/WebCore/html \ + $(LOCAL_PATH)/WebCore/inspector \ + $(LOCAL_PATH)/WebCore/loader \ + $(LOCAL_PATH)/WebCore/loader/appcache \ + $(LOCAL_PATH)/WebCore/loader/icon \ + $(LOCAL_PATH)/WebCore/page \ + $(LOCAL_PATH)/WebCore/page/android \ + $(LOCAL_PATH)/WebCore/page/animation \ + $(LOCAL_PATH)/WebCore/platform \ + $(LOCAL_PATH)/WebCore/platform/android \ + $(LOCAL_PATH)/WebCore/platform/animation \ + $(LOCAL_PATH)/WebCore/platform/graphics \ + $(LOCAL_PATH)/WebCore/platform/graphics/android \ + $(LOCAL_PATH)/WebCore/platform/graphics/network \ + $(LOCAL_PATH)/WebCore/platform/graphics/skia \ + $(LOCAL_PATH)/WebCore/platform/graphics/transforms \ + $(LOCAL_PATH)/WebCore/platform/image-decoders \ + $(LOCAL_PATH)/WebCore/platform/network \ + $(LOCAL_PATH)/WebCore/platform/network/android \ + $(LOCAL_PATH)/WebCore/platform/sql \ + $(LOCAL_PATH)/WebCore/platform/text \ + $(LOCAL_PATH)/WebCore/plugins \ + $(LOCAL_PATH)/WebCore/plugins/android \ + $(LOCAL_PATH)/WebCore/rendering \ + $(LOCAL_PATH)/WebCore/rendering/style \ + $(LOCAL_PATH)/WebCore/storage \ + $(LOCAL_PATH)/WebCore/workers \ + $(LOCAL_PATH)/WebCore/xml \ + $(LOCAL_PATH)/WebKit/android \ + $(LOCAL_PATH)/WebKit/android/WebCoreSupport \ + $(LOCAL_PATH)/WebKit/android/jni \ + $(LOCAL_PATH)/WebKit/android/nav \ + $(LOCAL_PATH)/WebKit/android/plugins \ + $(LOCAL_PATH)/WebKit/android/stl \ + $(LOCAL_PATH)/JavaScriptCore \ + $(LOCAL_PATH)/JavaScriptCore/API \ + $(LOCAL_PATH)/JavaScriptCore/assembler \ + $(LOCAL_PATH)/JavaScriptCore/bytecode \ + $(LOCAL_PATH)/JavaScriptCore/bytecompiler \ + $(LOCAL_PATH)/JavaScriptCore/debugger \ + $(LOCAL_PATH)/JavaScriptCore/parser \ + $(LOCAL_PATH)/JavaScriptCore/jit \ + $(LOCAL_PATH)/JavaScriptCore/interpreter \ + $(LOCAL_PATH)/JavaScriptCore/pcre \ + $(LOCAL_PATH)/JavaScriptCore/profiler \ + $(LOCAL_PATH)/JavaScriptCore/runtime \ + $(LOCAL_PATH)/JavaScriptCore/wrec \ + $(LOCAL_PATH)/JavaScriptCore/wtf \ + $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \ + $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu \ + $(LOCAL_PATH)/JavaScriptCore/ForwardingHeaders \ + $(base_intermediates)/JavaScriptCore \ + $(base_intermediates)/JavaScriptCore/parser \ + $(base_intermediates)/JavaScriptCore/runtime \ + $(base_intermediates)/WebCore/ \ + $(base_intermediates)/WebCore/bindings/js \ + $(base_intermediates)/WebCore/css \ + $(base_intermediates)/WebCore/dom \ + $(base_intermediates)/WebCore/html \ + $(base_intermediates)/WebCore/inspector \ + $(base_intermediates)/WebCore/loader/appcache \ + $(base_intermediates)/WebCore/page \ + $(base_intermediates)/WebCore/platform \ + $(base_intermediates)/WebCore/plugins \ + $(base_intermediates)/WebCore/storage \ + $(base_intermediates)/WebCore/xml + +ifeq ($(ENABLE_SVG), true) +LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ + $(LOCAL_PATH)/WebCore/platform/graphics/filters \ + $(LOCAL_PATH)/WebCore/svg \ + $(LOCAL_PATH)/WebCore/svg/animation \ + $(LOCAL_PATH)/WebCore/svg/graphics \ + $(LOCAL_PATH)/WebCore/svg/graphics/filters \ + $(base_intermediates)/WebCore/svg +endif + +# Build the list of shared libraries +LOCAL_SHARED_LIBRARIES := \ + libandroid_runtime \ + libnativehelper \ + libsqlite \ + libsgl \ + libcorecg \ + libutils \ + libui \ + libcutils \ + libicuuc \ + libicudata \ + libicui18n \ + libmedia + +# We have to use the android version of libdl when we are not on the simulator +ifneq ($(TARGET_SIMULATOR),true) +LOCAL_SHARED_LIBRARIES += libdl +endif + +# Build the list of static libraries +LOCAL_STATIC_LIBRARIES := libxml2 + +# Redefine LOCAL_SRC_FILES to be all the WebKit source files +LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) + +# Define this for use in other makefiles. +WEBKIT_C_INCLUDES := $(LOCAL_C_INCLUDES) +WEBKIT_CFLAGS := $(LOCAL_CFLAGS) +WEBKIT_GENERATED_SOURCES := $(LOCAL_GENERATED_SOURCES) +WEBKIT_LDLIBS := $(LOCAL_LDLIBS) +WEBKIT_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) +WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) + +# Build the library all at once +include $(BUILD_STATIC_LIBRARY) + +# Now build the shared library using only the exported jni entry point. This +# will strip out any unused code from the entry point. +include $(CLEAR_VARS) +# if you need to make webcore huge (for debugging), enable this line +#LOCAL_PRELINK_MODULE := false +LOCAL_MODULE := libwebcore +LOCAL_LDLIBS := $(WEBKIT_LDLIBS) +LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) +LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES) +LOCAL_LDFLAGS := -fvisibility=hidden +LOCAL_CFLAGS := $(WEBKIT_CFLAGS) +LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) +LOCAL_PATH := $(BASE_PATH) +LOCAL_SRC_FILES := \ + WebKit/android/jni/WebCoreJniOnLoad.cpp +include $(BUILD_SHARED_LIBRARY) + +# Build the wds client +include $(BASE_PATH)/WebKit/android/wds/client/Android.mk + +# Build the performance command line tool. +#include $(BASE_PATH)/perf/Android.mk + +# Build the webkit merge tool. +include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk @@ -1,6 +1,6 @@ ## ## -## Copyright 2007, The Android Open Source Project +## Copyright 2009, The Android Open Source Project ## ## Licensed under the Apache License, Version 2.0 (the "License"); ## you may not use this file except in compliance with the License. @@ -15,262 +15,10 @@ ## limitations under the License. ## -BASE_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Define our module and find the intermediates directory -LOCAL_MODULE := libwebcore -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -base_intermediates := $(call local-intermediates-dir) - -# Using := here prevents recursive expansion -WEBKIT_SRC_FILES := - -# We have to use bison 2.3 -include $(BASE_PATH)/bison_check.mk +LOCAL_PATH := $(call my-dir) ifeq ($(ENABLE_V8),true) - -d := V8Binding -LOCAL_PATH := $(BASE_PATH)/$d -WEBCORE_PATH := $(BASE_PATH)/WebCore -intermediates := $(base_intermediates)/WebCore -JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore -include $(LOCAL_PATH)/V8Binding.derived.mk -WEBKIT_SRC_FILES += $(addprefix $d/, $(LOCAL_SRC_FILES)) -WEBKIT_SRC_FILES += $(addprefix WebCore/, $(WEBCORE_SRC_FILES)) - -else # use JSC engine - -# Include source files for JavaScriptCore -d := JavaScriptCore -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) - -# Include the derived source files for WebCore. -# Use the same path as WebCore module. -d := WebCore -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/JavaScriptCore.derived.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) - -endif - - -# Include WTF source file. -d := JavaScriptCore -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.wtf.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) - - -# Include source files for WebCore -d := WebCore -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) -include $(LOCAL_PATH)/Android.derived.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) - -# Include source files for android WebKit port -d := WebKit -LOCAL_PATH := $(BASE_PATH)/$d -intermediates := $(base_intermediates)/$d -include $(LOCAL_PATH)/Android.mk -WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) - -# Redefine LOCAL_PATH here so the build system is not confused -LOCAL_PATH := $(BASE_PATH) - -# Define our compiler flags -LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format -LOCAL_CFLAGS += -fno-strict-aliasing -LOCAL_CFLAGS += -include "WebCorePrefixAndroid.h" -LOCAL_CFLAGS += -fvisibility=hidden - -ifeq ($(TARGET_ARCH),arm) -LOCAL_CFLAGS += -Darm -endif - -ifeq ($(ENABLE_SVG),true) -LOCAL_CFLAGS += -DENABLE_SVG=1 -endif - -# Temporary disable SVG_ANIMATION. -ifeq ($(ENABLE_SVG_ANIMATION),true) -LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1 -endif - -ifeq ($(WEBCORE_INSTRUMENTATION),true) -LOCAL_CFLAGS += -DANDROID_INSTRUMENT +# include $(LOCAL_PATH)/Android.v8.mk +else +include $(LOCAL_PATH)/Android.jsc.mk endif - -# LOCAL_LDLIBS is used in simulator builds only and simulator builds are only -# valid on Linux -LOCAL_LDLIBS += -lpthread -ldl - -# Build our list of include paths. We include WebKit/android/icu first so that -# any files that include <unicode/ucnv.h> will include our ucnv.h first. We -# also add external/ as an include directory so that we can specify the real -# icu header directory as a more exact reference to avoid including our ucnv.h. -LOCAL_C_INCLUDES := \ - $(JNI_H_INCLUDE) \ - $(LOCAL_PATH)/WebKit/android/icu \ - external/ \ - external/icu4c/common \ - external/icu4c/i18n \ - external/libxml2/include \ - external/skia/emoji \ - external/skia/include/core \ - external/skia/include/effects \ - external/skia/include/images \ - external/skia/include/ports \ - external/skia/include/utils \ - external/skia/src/ports \ - external/sqlite/dist \ - frameworks/base/core/jni/android/graphics \ - $(LOCAL_PATH) \ - $(LOCAL_PATH)/WebCore \ - $(LOCAL_PATH)/WebCore/css \ - $(LOCAL_PATH)/WebCore/dom \ - $(LOCAL_PATH)/WebCore/editing \ - $(LOCAL_PATH)/WebCore/history \ - $(LOCAL_PATH)/WebCore/html \ - $(LOCAL_PATH)/WebCore/inspector \ - $(LOCAL_PATH)/WebCore/loader \ - $(LOCAL_PATH)/WebCore/loader/appcache \ - $(LOCAL_PATH)/WebCore/loader/icon \ - $(LOCAL_PATH)/WebCore/page \ - $(LOCAL_PATH)/WebCore/page/android \ - $(LOCAL_PATH)/WebCore/page/animation \ - $(LOCAL_PATH)/WebCore/platform \ - $(LOCAL_PATH)/WebCore/platform/android \ - $(LOCAL_PATH)/WebCore/platform/animation \ - $(LOCAL_PATH)/WebCore/platform/graphics \ - $(LOCAL_PATH)/WebCore/platform/graphics/android \ - $(LOCAL_PATH)/WebCore/platform/graphics/network \ - $(LOCAL_PATH)/WebCore/platform/graphics/skia \ - $(LOCAL_PATH)/WebCore/platform/graphics/transforms \ - $(LOCAL_PATH)/WebCore/platform/image-decoders \ - $(LOCAL_PATH)/WebCore/platform/network \ - $(LOCAL_PATH)/WebCore/platform/network/android \ - $(LOCAL_PATH)/WebCore/platform/sql \ - $(LOCAL_PATH)/WebCore/platform/text \ - $(LOCAL_PATH)/WebCore/plugins \ - $(LOCAL_PATH)/WebCore/plugins/android \ - $(LOCAL_PATH)/WebCore/rendering \ - $(LOCAL_PATH)/WebCore/rendering/style \ - $(LOCAL_PATH)/WebCore/storage \ - $(LOCAL_PATH)/WebCore/workers \ - $(LOCAL_PATH)/WebCore/xml \ - $(LOCAL_PATH)/WebKit/android \ - $(LOCAL_PATH)/WebKit/android/WebCoreSupport \ - $(LOCAL_PATH)/WebKit/android/jni \ - $(LOCAL_PATH)/WebKit/android/nav \ - $(LOCAL_PATH)/WebKit/android/plugins \ - $(LOCAL_PATH)/WebKit/android/stl \ - $(LOCAL_PATH)/JavaScriptCore/wtf \ - $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \ - $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu \ - $(BINDING_C_INCLUDES) \ - $(base_intermediates)/WebCore/ \ - $(base_intermediates)/WebCore/css \ - $(base_intermediates)/WebCore/dom \ - $(base_intermediates)/WebCore/html \ - $(base_intermediates)/WebCore/inspector \ - $(base_intermediates)/WebCore/loader/appcache \ - $(base_intermediates)/WebCore/page \ - $(base_intermediates)/WebCore/platform \ - $(base_intermediates)/WebCore/plugins \ - $(base_intermediates)/WebCore/storage \ - $(base_intermediates)/WebCore/xml \ - $(base_intermediates)/JavaScriptCore - -ifeq ($(ENABLE_SVG), true) -LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ - $(LOCAL_PATH)/WebCore/platform/graphics/filters \ - $(LOCAL_PATH)/WebCore/svg \ - $(LOCAL_PATH)/WebCore/svg/animation \ - $(LOCAL_PATH)/WebCore/svg/graphics \ - $(LOCAL_PATH)/WebCore/svg/graphics/filters \ - $(base_intermediates)/WebCore/svg -endif - -# Build the list of shared libraries -LOCAL_SHARED_LIBRARIES := \ - libandroid_runtime \ - libnativehelper \ - libsqlite \ - libsgl \ - libcorecg \ - libutils \ - libui \ - libcutils \ - libicuuc \ - libicudata \ - libicui18n \ - libmedia - -# We have to use the android version of libdl when we are not on the simulator -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - -# Build the list of static libraries -LOCAL_STATIC_LIBRARIES := libxml2 - -ifeq ($(ENABLE_V8),true) -LOCAL_STATIC_LIBRARIES += libv8 -endif - -# Redefine LOCAL_SRC_FILES to be all the WebKit source files -LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) - -# Define this for use in other makefiles. -WEBKIT_C_INCLUDES := $(LOCAL_C_INCLUDES) -WEBKIT_CFLAGS := $(LOCAL_CFLAGS) -WEBKIT_GENERATED_SOURCES := $(LOCAL_GENERATED_SOURCES) -WEBKIT_LDLIBS := $(LOCAL_LDLIBS) -WEBKIT_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) -WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) - -# Build the library all at once -include $(BUILD_STATIC_LIBRARY) - -# Now build the shared library using only the exported jni entry point. This -# will strip out any unused code from the entry point. -include $(CLEAR_VARS) -# if you need to make webcore huge (for debugging), enable this line -#LOCAL_PRELINK_MODULE := false -LOCAL_MODULE := libwebcore -LOCAL_LDLIBS := $(WEBKIT_LDLIBS) -LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) -LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES) -LOCAL_LDFLAGS := -fvisibility=hidden -LOCAL_CFLAGS := $(WEBKIT_CFLAGS) -LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) -LOCAL_PATH := $(BASE_PATH) -LOCAL_SRC_FILES := \ - WebKit/android/jni/WebCoreJniOnLoad.cpp -include $(BUILD_SHARED_LIBRARY) - -# Build the wds client -include $(BASE_PATH)/WebKit/android/wds/client/Android.mk - -# Build the performance command line tool but only if v8 is disabled. -include $(BASE_PATH)/perf/Android.mk - -# Build the webkit merge tool. -include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk - -# Build libv8 -ifeq ($(ENABLE_V8),true) -include $(BASE_PATH)/v8/Android.mk -include $(BASE_PATH)/v8/Android.v8shell.mk -endif - diff --git a/Android.v8.mk b/Android.v8.mk new file mode 100644 index 0000000..fb7bbb4 --- /dev/null +++ b/Android.v8.mk @@ -0,0 +1,249 @@ +## +## +## Copyright 2007, The Android Open Source Project +## +## Licensed under the Apache License, Version 2.0 (the "License"); +## you may not use this file except in compliance with the License. +## You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## + +BASE_PATH := $(call my-dir) +include $(CLEAR_VARS) + +# Define our module and find the intermediates directory +LOCAL_MODULE := libwebcore +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +base_intermediates := $(call local-intermediates-dir) + +# Using := here prevents recursive expansion +WEBKIT_SRC_FILES := + +# We have to use bison 2.3 +include $(BASE_PATH)/bison_check.mk + +d := V8Binding +LOCAL_PATH := $(BASE_PATH)/$d +WEBCORE_PATH := $(BASE_PATH)/WebCore +intermediates := $(base_intermediates)/WebCore +JAVASCRIPTCORE_PATH := $(BASE_PATH)/JavaScriptCore +include $(LOCAL_PATH)/V8Binding.derived.mk +WEBKIT_SRC_FILES += $(addprefix $d/, $(LOCAL_SRC_FILES)) +WEBKIT_SRC_FILES += $(addprefix WebCore/, $(WEBCORE_SRC_FILES)) + +# Include WTF source file. +d := JavaScriptCore +LOCAL_PATH := $(BASE_PATH)/$d +intermediates := $(base_intermediates)/$d +include $(LOCAL_PATH)/Android.wtf.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Include source files for WebCore +d := WebCore +LOCAL_PATH := $(BASE_PATH)/$d +intermediates := $(base_intermediates)/$d +include $(LOCAL_PATH)/Android.v8.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Include the derived source files for WebCore. Uses the same path as +# WebCore +include $(LOCAL_PATH)/Android.v8.derived.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Include source files for android WebKit port +d := WebKit +LOCAL_PATH := $(BASE_PATH)/$d +intermediates := $(base_intermediates)/$d +include $(LOCAL_PATH)/Android.mk +WEBKIT_SRC_FILES += $(addprefix $d/,$(LOCAL_SRC_FILES)) + +# Redefine LOCAL_PATH here so the build system is not confused +LOCAL_PATH := $(BASE_PATH) + +# Define our compiler flags +LOCAL_CFLAGS += -Wno-endif-labels -Wno-import -Wno-format +LOCAL_CFLAGS += -fno-strict-aliasing +LOCAL_CFLAGS += -include "WebCorePrefixAndroid.h" +LOCAL_CFLAGS += -fvisibility=hidden + +ifeq ($(TARGET_ARCH),arm) +LOCAL_CFLAGS += -Darm +endif + +ifeq ($(ENABLE_SVG),true) +LOCAL_CFLAGS += -DENABLE_SVG=1 +endif + +# Temporary disable SVG_ANIMATION. +ifeq ($(ENABLE_SVG_ANIMATION),true) +LOCAL_CFLAGS += -DENABLE_SVG_ANIMATION=1 +endif + +ifeq ($(WEBCORE_INSTRUMENTATION),true) +LOCAL_CFLAGS += -DANDROID_INSTRUMENT +endif + +# LOCAL_LDLIBS is used in simulator builds only and simulator builds are only +# valid on Linux +LOCAL_LDLIBS += -lpthread -ldl + +# Build our list of include paths. We include WebKit/android/icu first so that +# any files that include <unicode/ucnv.h> will include our ucnv.h first. We +# also add external/ as an include directory so that we can specify the real +# icu header directory as a more exact reference to avoid including our ucnv.h. +LOCAL_C_INCLUDES := \ + $(JNI_H_INCLUDE) \ + $(LOCAL_PATH)/WebKit/android/icu \ + external/ \ + external/icu4c/common \ + external/icu4c/i18n \ + external/libxml2/include \ + external/skia/emoji \ + external/skia/include/core \ + external/skia/include/effects \ + external/skia/include/images \ + external/skia/include/ports \ + external/skia/include/utils \ + external/skia/src/ports \ + external/sqlite/dist \ + frameworks/base/core/jni/android/graphics \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/WebCore \ + $(LOCAL_PATH)/WebCore/css \ + $(LOCAL_PATH)/WebCore/dom \ + $(LOCAL_PATH)/WebCore/editing \ + $(LOCAL_PATH)/WebCore/history \ + $(LOCAL_PATH)/WebCore/html \ + $(LOCAL_PATH)/WebCore/inspector \ + $(LOCAL_PATH)/WebCore/loader \ + $(LOCAL_PATH)/WebCore/loader/appcache \ + $(LOCAL_PATH)/WebCore/loader/icon \ + $(LOCAL_PATH)/WebCore/page \ + $(LOCAL_PATH)/WebCore/page/android \ + $(LOCAL_PATH)/WebCore/page/animation \ + $(LOCAL_PATH)/WebCore/platform \ + $(LOCAL_PATH)/WebCore/platform/android \ + $(LOCAL_PATH)/WebCore/platform/animation \ + $(LOCAL_PATH)/WebCore/platform/graphics \ + $(LOCAL_PATH)/WebCore/platform/graphics/android \ + $(LOCAL_PATH)/WebCore/platform/graphics/network \ + $(LOCAL_PATH)/WebCore/platform/graphics/skia \ + $(LOCAL_PATH)/WebCore/platform/graphics/transforms \ + $(LOCAL_PATH)/WebCore/platform/image-decoders \ + $(LOCAL_PATH)/WebCore/platform/network \ + $(LOCAL_PATH)/WebCore/platform/network/android \ + $(LOCAL_PATH)/WebCore/platform/sql \ + $(LOCAL_PATH)/WebCore/platform/text \ + $(LOCAL_PATH)/WebCore/plugins \ + $(LOCAL_PATH)/WebCore/plugins/android \ + $(LOCAL_PATH)/WebCore/rendering \ + $(LOCAL_PATH)/WebCore/rendering/style \ + $(LOCAL_PATH)/WebCore/storage \ + $(LOCAL_PATH)/WebCore/workers \ + $(LOCAL_PATH)/WebCore/xml \ + $(LOCAL_PATH)/WebKit/android \ + $(LOCAL_PATH)/WebKit/android/WebCoreSupport \ + $(LOCAL_PATH)/WebKit/android/jni \ + $(LOCAL_PATH)/WebKit/android/nav \ + $(LOCAL_PATH)/WebKit/android/plugins \ + $(LOCAL_PATH)/WebKit/android/stl \ + $(LOCAL_PATH)/JavaScriptCore/wtf \ + $(LOCAL_PATH)/JavaScriptCore/wtf/unicode \ + $(LOCAL_PATH)/JavaScriptCore/wtf/unicode/icu \ + $(BINDING_C_INCLUDES) \ + $(base_intermediates)/WebCore/ \ + $(base_intermediates)/WebCore/css \ + $(base_intermediates)/WebCore/dom \ + $(base_intermediates)/WebCore/html \ + $(base_intermediates)/WebCore/inspector \ + $(base_intermediates)/WebCore/loader/appcache \ + $(base_intermediates)/WebCore/page \ + $(base_intermediates)/WebCore/platform \ + $(base_intermediates)/WebCore/plugins \ + $(base_intermediates)/WebCore/storage \ + $(base_intermediates)/WebCore/xml \ + $(base_intermediates)/JavaScriptCore + +ifeq ($(ENABLE_SVG), true) +LOCAL_C_INCLUDES := $(LOCAL_C_INCLUDES) \ + $(LOCAL_PATH)/WebCore/platform/graphics/filters \ + $(LOCAL_PATH)/WebCore/svg \ + $(LOCAL_PATH)/WebCore/svg/animation \ + $(LOCAL_PATH)/WebCore/svg/graphics \ + $(LOCAL_PATH)/WebCore/svg/graphics/filters \ + $(base_intermediates)/WebCore/svg +endif + +# Build the list of shared libraries +LOCAL_SHARED_LIBRARIES := \ + libandroid_runtime \ + libnativehelper \ + libsqlite \ + libsgl \ + libcorecg \ + libutils \ + libui \ + libcutils \ + libicuuc \ + libicudata \ + libicui18n \ + libmedia + +# We have to use the android version of libdl when we are not on the simulator +ifneq ($(TARGET_SIMULATOR),true) +LOCAL_SHARED_LIBRARIES += libdl +endif + +# Build the list of static libraries +LOCAL_STATIC_LIBRARIES := libxml2 libv8 + +# Redefine LOCAL_SRC_FILES to be all the WebKit source files +LOCAL_SRC_FILES := $(WEBKIT_SRC_FILES) + +# Define this for use in other makefiles. +WEBKIT_C_INCLUDES := $(LOCAL_C_INCLUDES) +WEBKIT_CFLAGS := $(LOCAL_CFLAGS) +WEBKIT_GENERATED_SOURCES := $(LOCAL_GENERATED_SOURCES) +WEBKIT_LDLIBS := $(LOCAL_LDLIBS) +WEBKIT_SHARED_LIBRARIES := $(LOCAL_SHARED_LIBRARIES) +WEBKIT_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) + +# Build the library all at once +include $(BUILD_STATIC_LIBRARY) + +# Now build the shared library using only the exported jni entry point. This +# will strip out any unused code from the entry point. +include $(CLEAR_VARS) +# if you need to make webcore huge (for debugging), enable this line +#LOCAL_PRELINK_MODULE := false +LOCAL_MODULE := libwebcore +LOCAL_LDLIBS := $(WEBKIT_LDLIBS) +LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) +LOCAL_STATIC_LIBRARIES := libwebcore $(WEBKIT_STATIC_LIBRARIES) +LOCAL_LDFLAGS := -fvisibility=hidden +LOCAL_CFLAGS := $(WEBKIT_CFLAGS) +LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) +LOCAL_PATH := $(BASE_PATH) +LOCAL_SRC_FILES := \ + WebKit/android/jni/WebCoreJniOnLoad.cpp +include $(BUILD_SHARED_LIBRARY) + +# Build the wds client +include $(BASE_PATH)/WebKit/android/wds/client/Android.mk + +# Build the performance command line tool. +#include $(BASE_PATH)/perf/Android.mk + +# Build the webkit merge tool. +include $(BASE_PATH)/WebKitTools/android/webkitmerge/Android.mk + +# Build libv8 and v8shell +include $(BASE_PATH)/v8/Android.mk +include $(BASE_PATH)/v8/Android.v8shell.mk diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 4e0df78..fbad0f6 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -72,6 +72,12 @@ LOCAL_SRC_FILES := \ parser/Nodes.cpp \ parser/Parser.cpp \ \ + pcre/pcre_compile.cpp \ + pcre/pcre_exec.cpp \ + pcre/pcre_tables.cpp \ + pcre/pcre_ucp_searchfuncs.cpp \ + pcre/pcre_xclass.cpp \ + \ profiler/HeavyProfile.cpp \ profiler/Profile.cpp \ profiler/ProfileGenerator.cpp \ @@ -160,6 +166,27 @@ LOCAL_SRC_FILES := \ wrec/WRECGenerator.cpp \ wrec/WRECParser.cpp \ \ + wtf/Assertions.cpp \ + wtf/ByteArray.cpp \ + wtf/CurrentTime.cpp \ + wtf/FastMalloc.cpp \ + wtf/HashTable.cpp \ + wtf/MainThread.cpp \ + wtf/RandomNumber.cpp \ + wtf/RefCountedLeakCounter.cpp \ + wtf/TCSystemAlloc.cpp \ + wtf/Threading.cpp \ + wtf/ThreadingPthreads.cpp \ + \ + wtf/android/MainThreadAndroid.cpp \ + \ + wtf/TypeTraits.cpp \ + wtf/dtoa.cpp \ + \ + wtf/unicode/CollatorDefault.cpp \ + wtf/unicode/UTF8.cpp \ + \ + wtf/unicode/icu/CollatorICU.cpp # Rule to build grammar.y with our custom bison. GEN := $(intermediates)/parser/Grammar.cpp @@ -193,4 +220,13 @@ $(LEXER_HEADER): $(LOCAL_PATH)/create_hash_table $(LEXER_HEADER): $(intermediates)/%.lut.h : $(LOCAL_PATH)/parser/Keywords.table $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) +CHARTABLES := $(intermediates)/chartables.c +$(CHARTABLES): PRIVATE_PATH := $(LOCAL_PATH) +$(CHARTABLES): PRIVATE_CUSTOM_TOOL = perl $(PRIVATE_PATH)/pcre/dftables $@ +$(CHARTABLES): $(LOCAL_PATH)/pcre/dftables +$(CHARTABLES): $(LOCAL_PATH)/pcre/pcre_internal.h + $(transform-generated-source) + +$(intermediates)/pcre/pcre_tables.o : $(CHARTABLES) + +LOCAL_GENERATED_SOURCES += $(JSC_OBJECTS) $(LEXER_HEADER) $(CHARTABLES) diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index fc2c8cd..24c271f 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -174,16 +174,6 @@ $(GEN): $(make_css_file_arrays) $(style_sheets) $(transform-generated-source) LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) -# XML attribute names - -GEN:= $(intermediates)/XMLNames.cpp -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --attrs $(xml_attrs) --output $(dir $@) -$(GEN): xml_attrs := $(LOCAL_PATH)/xml/xmlattrs.in -$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(xml_attrs) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - # character set name table #gen_inputs := \ @@ -198,3 +188,533 @@ LOCAL_GENERATED_SOURCES += $(GEN) # the above rule will make this build too $(intermediates)/css/UserAgentStyleSheets.cpp : $(GEN) + + +# lookup tables for old-style JavaScript bindings +create_hash_table := $(LOCAL_PATH)/../JavaScriptCore/create_hash_table + +GEN := $(addprefix $(intermediates)/, \ + bindings/js/JSDOMWindowBase.lut.h \ + bindings/js/JSRGBColor.lut.h \ + ) +$(GEN): PRIVATE_CUSTOM_TOOL = perl $(create_hash_table) $< > $@ +$(GEN): $(intermediates)/bindings/js/%.lut.h: $(LOCAL_PATH)/bindings/js/%.cpp $(create_hash_table) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + + +GEN := $(intermediates)/bindings/js/JSHTMLInputElementBaseTable.cpp +$(GEN): PRIVATE_CUSTOM_TOOL = perl $(create_hash_table) $< > $@ +$(GEN): $(intermediates)/bindings/js/%Table.cpp: $(LOCAL_PATH)/bindings/js/%.cpp $(create_hash_table) + $(transform-generated-source) +$(intermediates)/bindings/js/JSHTMLInputElementBase.o : $(GEN) + +# lookup tables for old-style JavaScript bindings +js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ + bindings/scripts/CodeGenerator.pm \ + bindings/scripts/IDLParser.pm \ + bindings/scripts/IDLStructure.pm \ + bindings/scripts/generate-bindings.pl \ + ) + +FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 + +GEN := \ + $(intermediates)/css/JSCSSCharsetRule.h \ + $(intermediates)/css/JSCSSFontFaceRule.h \ + $(intermediates)/css/JSCSSImportRule.h \ + $(intermediates)/css/JSCSSMediaRule.h \ + $(intermediates)/css/JSCSSPageRule.h \ + $(intermediates)/css/JSCSSPrimitiveValue.h \ + $(intermediates)/css/JSCSSRule.h \ + $(intermediates)/css/JSCSSRuleList.h \ + $(intermediates)/css/JSCSSStyleDeclaration.h \ + $(intermediates)/css/JSCSSStyleRule.h \ + $(intermediates)/css/JSCSSStyleSheet.h \ + $(intermediates)/css/JSCSSUnknownRule.h \ + $(intermediates)/css/JSCSSValue.h \ + $(intermediates)/css/JSCSSValueList.h \ + $(intermediates)/css/JSCSSVariablesDeclaration.h \ + $(intermediates)/css/JSCSSVariablesRule.h \ + $(intermediates)/css/JSCounter.h \ + $(intermediates)/css/JSMediaList.h \ + $(intermediates)/css/JSRect.h \ + $(intermediates)/css/JSStyleSheet.h \ + $(intermediates)/css/JSStyleSheetList.h \ + $(intermediates)/css/JSWebKitCSSKeyframeRule.h \ + $(intermediates)/css/JSWebKitCSSKeyframesRule.h \ + $(intermediates)/css/JSWebKitCSSMatrix.h \ + $(intermediates)/css/JSWebKitCSSTransformValue.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/css/JS%.h : $(LOCAL_PATH)/css/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/css/%.cpp : $(intermediates)/css/%.h + +# MANUAL MERGE : I took this out because compiling the result shows: +# out/.../JSEventTarget.cpp: In function 'JSC::JSValue* WebCore::jsEventTargetPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue*, const JSC::ArgList&)': +# out/.../JSEventTarget.cpp:90: error: 'toEventListener' was not declared in this scope +# but I can't find toEventListener anywhere, nor can I figure out how toEventListener +# is generated +# $(intermediates)/dom/JSEventTarget.h \ + +GEN := \ + $(intermediates)/dom/JSAttr.h \ + $(intermediates)/dom/JSCDATASection.h \ + $(intermediates)/dom/JSCharacterData.h \ + $(intermediates)/dom/JSClientRect.h \ + $(intermediates)/dom/JSClientRectList.h \ + $(intermediates)/dom/JSClipboard.h \ + $(intermediates)/dom/JSComment.h \ + $(intermediates)/dom/JSDOMCoreException.h \ + $(intermediates)/dom/JSDOMImplementation.h \ + $(intermediates)/dom/JSDOMStringList.h \ + $(intermediates)/dom/JSDocument.h \ + $(intermediates)/dom/JSDocumentFragment.h \ + $(intermediates)/dom/JSDocumentType.h \ + $(intermediates)/dom/JSElement.h \ + $(intermediates)/dom/JSEntity.h \ + $(intermediates)/dom/JSEntityReference.h \ + $(intermediates)/dom/JSEvent.h \ + $(intermediates)/dom/JSEventException.h \ + $(intermediates)/dom/JSKeyboardEvent.h \ + $(intermediates)/dom/JSMessageChannel.h \ + $(intermediates)/dom/JSMessageEvent.h \ + $(intermediates)/dom/JSMessagePort.h \ + $(intermediates)/dom/JSMouseEvent.h \ + $(intermediates)/dom/JSMutationEvent.h \ + $(intermediates)/dom/JSNamedNodeMap.h \ + $(intermediates)/dom/JSNode.h \ + $(intermediates)/dom/JSNodeFilter.h \ + $(intermediates)/dom/JSNodeIterator.h \ + $(intermediates)/dom/JSNodeList.h \ + $(intermediates)/dom/JSNotation.h \ + $(intermediates)/dom/JSOverflowEvent.h \ + $(intermediates)/dom/JSProcessingInstruction.h \ + $(intermediates)/dom/JSProgressEvent.h \ + $(intermediates)/dom/JSRange.h \ + $(intermediates)/dom/JSRangeException.h \ + $(intermediates)/dom/JSText.h \ + $(intermediates)/dom/JSTextEvent.h \ + $(intermediates)/dom/JSTouch.h \ + $(intermediates)/dom/JSTouchEvent.h \ + $(intermediates)/dom/JSTouchList.h \ + $(intermediates)/dom/JSTreeWalker.h \ + $(intermediates)/dom/JSUIEvent.h \ + $(intermediates)/dom/JSWebKitAnimationEvent.h \ + $(intermediates)/dom/JSWebKitTransitionEvent.h \ + $(intermediates)/dom/JSWheelEvent.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/dom/JS%.h : $(LOCAL_PATH)/dom/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/%.h + + +GEN := \ + $(intermediates)/html/JSCanvasGradient.h \ + $(intermediates)/html/JSCanvasPattern.h \ + $(intermediates)/html/JSCanvasRenderingContext2D.h \ + $(intermediates)/html/JSFile.h \ + $(intermediates)/html/JSFileList.h \ + $(intermediates)/html/JSHTMLAnchorElement.h \ + $(intermediates)/html/JSHTMLAppletElement.h \ + $(intermediates)/html/JSHTMLAreaElement.h \ + $(intermediates)/html/JSHTMLBRElement.h \ + $(intermediates)/html/JSHTMLBaseElement.h \ + $(intermediates)/html/JSHTMLBaseFontElement.h \ + $(intermediates)/html/JSHTMLBlockquoteElement.h \ + $(intermediates)/html/JSHTMLBodyElement.h \ + $(intermediates)/html/JSHTMLButtonElement.h \ + $(intermediates)/html/JSHTMLCanvasElement.h \ + $(intermediates)/html/JSHTMLCollection.h \ + $(intermediates)/html/JSHTMLDListElement.h \ + $(intermediates)/html/JSHTMLDirectoryElement.h \ + $(intermediates)/html/JSHTMLDivElement.h \ + $(intermediates)/html/JSHTMLDocument.h \ + $(intermediates)/html/JSHTMLElement.h \ + $(intermediates)/html/JSHTMLEmbedElement.h \ + $(intermediates)/html/JSHTMLFieldSetElement.h \ + $(intermediates)/html/JSHTMLFontElement.h \ + $(intermediates)/html/JSHTMLFormElement.h \ + $(intermediates)/html/JSHTMLFrameElement.h \ + $(intermediates)/html/JSHTMLFrameSetElement.h \ + $(intermediates)/html/JSHTMLHRElement.h \ + $(intermediates)/html/JSHTMLHeadElement.h \ + $(intermediates)/html/JSHTMLHeadingElement.h \ + $(intermediates)/html/JSHTMLHtmlElement.h \ + $(intermediates)/html/JSHTMLIFrameElement.h \ + $(intermediates)/html/JSHTMLImageElement.h \ + $(intermediates)/html/JSHTMLInputElement.h \ + $(intermediates)/html/JSHTMLIsIndexElement.h \ + $(intermediates)/html/JSHTMLLIElement.h \ + $(intermediates)/html/JSHTMLLabelElement.h \ + $(intermediates)/html/JSHTMLLegendElement.h \ + $(intermediates)/html/JSHTMLLinkElement.h \ + $(intermediates)/html/JSHTMLMapElement.h \ + $(intermediates)/html/JSHTMLMarqueeElement.h \ + $(intermediates)/html/JSHTMLMenuElement.h \ + $(intermediates)/html/JSHTMLMetaElement.h \ + $(intermediates)/html/JSHTMLModElement.h \ + $(intermediates)/html/JSHTMLOListElement.h \ + $(intermediates)/html/JSHTMLObjectElement.h \ + $(intermediates)/html/JSHTMLOptGroupElement.h \ + $(intermediates)/html/JSHTMLOptionElement.h \ + $(intermediates)/html/JSHTMLOptionsCollection.h \ + $(intermediates)/html/JSHTMLParagraphElement.h \ + $(intermediates)/html/JSHTMLParamElement.h \ + $(intermediates)/html/JSHTMLPreElement.h \ + $(intermediates)/html/JSHTMLQuoteElement.h \ + $(intermediates)/html/JSHTMLScriptElement.h \ + $(intermediates)/html/JSHTMLSelectElement.h \ + $(intermediates)/html/JSHTMLSourceElement.h \ + $(intermediates)/html/JSHTMLStyleElement.h \ + $(intermediates)/html/JSHTMLTableCaptionElement.h \ + $(intermediates)/html/JSHTMLTableCellElement.h \ + $(intermediates)/html/JSHTMLTableColElement.h \ + $(intermediates)/html/JSHTMLTableElement.h \ + $(intermediates)/html/JSHTMLTableRowElement.h \ + $(intermediates)/html/JSHTMLTableSectionElement.h \ + $(intermediates)/html/JSHTMLTextAreaElement.h \ + $(intermediates)/html/JSHTMLTitleElement.h \ + $(intermediates)/html/JSHTMLUListElement.h \ + $(intermediates)/html/JSHTMLVideoElement.h \ + $(intermediates)/html/JSImageData.h \ + $(intermediates)/html/JSMediaError.h \ + $(intermediates)/html/JSTextMetrics.h \ + $(intermediates)/html/JSTimeRanges.h \ + $(intermediates)/html/JSVoidCallback.h + +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/html/JS%.h : $(LOCAL_PATH)/html/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/html/%.h + +GEN := \ + $(intermediates)/inspector/JSJavaScriptCallFrame.h + +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/inspector/JS%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/inspector/%.cpp : $(intermediates)/inspector/%.h + +GEN := \ + $(intermediates)/loader/appcache/JSDOMApplicationCache.h + +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/loader/appcache/JS%.h : $(LOCAL_PATH)/loader/appcache/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/loader/appcache/%.cpp : $(intermediates)/loader/appcache/%.h + +# MANUAL MERGE : I took this out because compiling the result shows: +# out/.../JSAbstractView.cpp:27:26: error: AbstractView.h: No such file or directory +# I can't find AbstractView.h anywhere +# $(intermediates)/page/JSAbstractView.h \ +# +# also: +# +# out/.../JSPositionCallback.cpp:145: error: no matching function for call to 'WebCore::PositionCallback::handleEvent(WebCore::Geoposition*&)' +# note: candidates are: virtual void WebCore::PositionCallback::handleEvent(WebCore::Geoposition*, bool&) +# $(intermediates)/page/JSPositionCallback.h \ + +GEN := \ + $(intermediates)/page/JSBarInfo.h \ + $(intermediates)/page/JSConsole.h \ + $(intermediates)/page/JSCoordinates.h \ + $(intermediates)/page/JSDOMSelection.h \ + $(intermediates)/page/JSDOMWindow.h \ + $(intermediates)/page/JSGeolocation.h \ + $(intermediates)/page/JSGeoposition.h \ + $(intermediates)/page/JSHistory.h \ + $(intermediates)/page/JSLocation.h \ + $(intermediates)/page/JSNavigator.h \ + $(intermediates)/page/JSPositionError.h \ + $(intermediates)/page/JSPositionErrorCallback.h \ + $(intermediates)/page/JSScreen.h \ + $(intermediates)/page/JSWebKitPoint.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/page/JS%.h : $(LOCAL_PATH)/page/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/page/%.cpp : $(intermediates)/page/%.h + +GEN := \ + $(intermediates)/plugins/JSMimeType.h \ + $(intermediates)/plugins/JSMimeTypeArray.h \ + $(intermediates)/plugins/JSPlugin.h \ + $(intermediates)/plugins/JSPluginArray.h + +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/plugins/JS%.h : $(LOCAL_PATH)/plugins/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/plugins/%.h + +# New section for Database storage API +GEN := \ + $(intermediates)/storage/JSDatabase.h \ + $(intermediates)/storage/JSSQLError.h \ + $(intermediates)/storage/JSSQLResultSet.h \ + $(intermediates)/storage/JSSQLResultSetRowList.h \ + $(intermediates)/storage/JSSQLTransaction.h + +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/storage/JS%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h + +#new section for svg +ifeq ($(ENABLE_SVG), true) +GEN := \ + $(intermediates)/svg/JSSVGAElement.h \ + $(intermediates)/svg/JSSVGAltGlyphElement.h \ + $(intermediates)/svg/JSSVGAngle.h \ + $(intermediates)/svg/JSSVGAnimateColorElement.h \ + $(intermediates)/svg/JSSVGAnimateElement.h \ + $(intermediates)/svg/JSSVGAnimateTransformElement.h \ + $(intermediates)/svg/JSSVGAnimatedAngle.h \ + $(intermediates)/svg/JSSVGAnimatedBoolean.h \ + $(intermediates)/svg/JSSVGAnimatedEnumeration.h \ + $(intermediates)/svg/JSSVGAnimatedInteger.h \ + $(intermediates)/svg/JSSVGAnimatedLength.h \ + $(intermediates)/svg/JSSVGAnimatedLengthList.h \ + $(intermediates)/svg/JSSVGAnimatedNumber.h \ + $(intermediates)/svg/JSSVGAnimatedNumberList.h \ + $(intermediates)/svg/JSSVGAnimatedPreserveAspectRatio.h \ + $(intermediates)/svg/JSSVGAnimatedRect.h \ + $(intermediates)/svg/JSSVGAnimatedString.h \ + $(intermediates)/svg/JSSVGAnimatedTransformList.h \ + $(intermediates)/svg/JSSVGAnimationElement.h \ + $(intermediates)/svg/JSSVGCircleElement.h \ + $(intermediates)/svg/JSSVGClipPathElement.h \ + $(intermediates)/svg/JSSVGColor.h \ + $(intermediates)/svg/JSSVGComponentTransferFunctionElement.h \ + $(intermediates)/svg/JSSVGCursorElement.h \ + $(intermediates)/svg/JSSVGDefinitionSrcElement.h \ + $(intermediates)/svg/JSSVGDefsElement.h \ + $(intermediates)/svg/JSSVGDescElement.h \ + $(intermediates)/svg/JSSVGDocument.h \ + $(intermediates)/svg/JSSVGElement.h \ + $(intermediates)/svg/JSSVGElementInstance.h \ + $(intermediates)/svg/JSSVGElementInstanceList.h \ + $(intermediates)/svg/JSSVGEllipseElement.h \ + $(intermediates)/svg/JSSVGException.h \ + $(intermediates)/svg/JSSVGFEBlendElement.h \ + $(intermediates)/svg/JSSVGFEColorMatrixElement.h \ + $(intermediates)/svg/JSSVGFEComponentTransferElement.h \ + $(intermediates)/svg/JSSVGFECompositeElement.h \ + $(intermediates)/svg/JSSVGFEDiffuseLightingElement.h \ + $(intermediates)/svg/JSSVGFEDisplacementMapElement.h \ + $(intermediates)/svg/JSSVGFEDistantLightElement.h \ + $(intermediates)/svg/JSSVGFEFloodElement.h \ + $(intermediates)/svg/JSSVGFEFuncAElement.h \ + $(intermediates)/svg/JSSVGFEFuncBElement.h \ + $(intermediates)/svg/JSSVGFEFuncGElement.h \ + $(intermediates)/svg/JSSVGFEFuncRElement.h \ + $(intermediates)/svg/JSSVGFEGaussianBlurElement.h \ + $(intermediates)/svg/JSSVGFEImageElement.h \ + $(intermediates)/svg/JSSVGFEMergeElement.h \ + $(intermediates)/svg/JSSVGFEMergeNodeElement.h \ + $(intermediates)/svg/JSSVGFEOffsetElement.h \ + $(intermediates)/svg/JSSVGFEPointLightElement.h \ + $(intermediates)/svg/JSSVGFESpecularLightingElement.h \ + $(intermediates)/svg/JSSVGFESpotLightElement.h \ + $(intermediates)/svg/JSSVGFETileElement.h \ + $(intermediates)/svg/JSSVGFETurbulenceElement.h \ + $(intermediates)/svg/JSSVGFilterElement.h \ + $(intermediates)/svg/JSSVGFontElement.h \ + $(intermediates)/svg/JSSVGFontFaceElement.h \ + $(intermediates)/svg/JSSVGFontFaceFormatElement.h \ + $(intermediates)/svg/JSSVGFontFaceNameElement.h \ + $(intermediates)/svg/JSSVGFontFaceSrcElement.h \ + $(intermediates)/svg/JSSVGFontFaceUriElement.h \ + $(intermediates)/svg/JSSVGForeignObjectElement.h \ + $(intermediates)/svg/JSSVGGElement.h \ + $(intermediates)/svg/JSSVGGlyphElement.h \ + $(intermediates)/svg/JSSVGGradientElement.h \ + $(intermediates)/svg/JSSVGHKernElement.h \ + $(intermediates)/svg/JSSVGImageElement.h \ + $(intermediates)/svg/JSSVGLength.h \ + $(intermediates)/svg/JSSVGLengthList.h \ + $(intermediates)/svg/JSSVGLineElement.h \ + $(intermediates)/svg/JSSVGLinearGradientElement.h \ + $(intermediates)/svg/JSSVGMarkerElement.h \ + $(intermediates)/svg/JSSVGMaskElement.h \ + $(intermediates)/svg/JSSVGMatrix.h \ + $(intermediates)/svg/JSSVGMetadataElement.h \ + $(intermediates)/svg/JSSVGMissingGlyphElement.h \ + $(intermediates)/svg/JSSVGNumber.h \ + $(intermediates)/svg/JSSVGNumberList.h \ + $(intermediates)/svg/JSSVGPaint.h \ + $(intermediates)/svg/JSSVGPathElement.h \ + $(intermediates)/svg/JSSVGPathSeg.h \ + $(intermediates)/svg/JSSVGPathSegArcAbs.h \ + $(intermediates)/svg/JSSVGPathSegArcRel.h \ + $(intermediates)/svg/JSSVGPathSegClosePath.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoCubicAbs.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoCubicRel.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoCubicSmoothAbs.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoCubicSmoothRel.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticAbs.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticRel.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticSmoothAbs.h \ + $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticSmoothRel.h \ + $(intermediates)/svg/JSSVGPathSegLinetoAbs.h \ + $(intermediates)/svg/JSSVGPathSegLinetoHorizontalAbs.h \ + $(intermediates)/svg/JSSVGPathSegLinetoHorizontalRel.h \ + $(intermediates)/svg/JSSVGPathSegLinetoRel.h \ + $(intermediates)/svg/JSSVGPathSegLinetoVerticalAbs.h \ + $(intermediates)/svg/JSSVGPathSegLinetoVerticalRel.h \ + $(intermediates)/svg/JSSVGPathSegList.h \ + $(intermediates)/svg/JSSVGPathSegMovetoAbs.h \ + $(intermediates)/svg/JSSVGPathSegMovetoRel.h \ + $(intermediates)/svg/JSSVGPatternElement.h \ + $(intermediates)/svg/JSSVGPoint.h \ + $(intermediates)/svg/JSSVGPointList.h \ + $(intermediates)/svg/JSSVGPolygonElement.h \ + $(intermediates)/svg/JSSVGPolylineElement.h \ + $(intermediates)/svg/JSSVGPreserveAspectRatio.h \ + $(intermediates)/svg/JSSVGRadialGradientElement.h \ + $(intermediates)/svg/JSSVGRect.h \ + $(intermediates)/svg/JSSVGRectElement.h \ + $(intermediates)/svg/JSSVGRenderingIntent.h \ + $(intermediates)/svg/JSSVGSVGElement.h \ + $(intermediates)/svg/JSSVGScriptElement.h \ + $(intermediates)/svg/JSSVGSetElement.h \ + $(intermediates)/svg/JSSVGStopElement.h \ + $(intermediates)/svg/JSSVGStringList.h \ + $(intermediates)/svg/JSSVGStyleElement.h \ + $(intermediates)/svg/JSSVGSwitchElement.h \ + $(intermediates)/svg/JSSVGSymbolElement.h \ + $(intermediates)/svg/JSSVGTRefElement.h \ + $(intermediates)/svg/JSSVGTSpanElement.h \ + $(intermediates)/svg/JSSVGTextContentElement.h \ + $(intermediates)/svg/JSSVGTextElement.h \ + $(intermediates)/svg/JSSVGTextPathElement.h \ + $(intermediates)/svg/JSSVGTextPositioningElement.h \ + $(intermediates)/svg/JSSVGTitleElement.h \ + $(intermediates)/svg/JSSVGTransform.h \ + $(intermediates)/svg/JSSVGTransformList.h \ + $(intermediates)/svg/JSSVGUnitTypes.h \ + $(intermediates)/svg/JSSVGUseElement.h \ + $(intermediates)/svg/JSSVGViewElement.h \ + $(intermediates)/svg/JSSVGZoomEvent.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include external/webkit/WebCore/dom --include external/webkit/WebCore/html --include external/webkit/WebCore/svg --outputdir $(dir $@) $< +$(GEN): $(intermediates)/svg/JS%.h : $(LOCAL_PATH)/svg/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/svg/%.cpp : $(intermediates)/svg/%.h +endif + +#new section for xml/DOMParser.idl +GEN := \ + $(intermediates)/xml/JSDOMParser.h \ + $(intermediates)/xml/JSXMLHttpRequest.h \ + $(intermediates)/xml/JSXMLHttpRequestException.h \ + $(intermediates)/xml/JSXMLHttpRequestProgressEvent.h \ + $(intermediates)/xml/JSXMLHttpRequestUpload.h \ + $(intermediates)/xml/JSXMLSerializer.h \ + $(intermediates)/xml/JSXPathEvaluator.h \ + $(intermediates)/xml/JSXPathException.h \ + $(intermediates)/xml/JSXPathExpression.h \ + $(intermediates)/xml/JSXPathNSResolver.h \ + $(intermediates)/xml/JSXPathResult.h \ + $(intermediates)/xml/JSXSLTProcessor.h +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< +$(GEN): $(intermediates)/xml/JS%.h : $(LOCAL_PATH)/xml/%.idl $(js_binding_scripts) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) + +# We also need the .cpp files, which are generated as side effects of the +# above rules. Specifying this explicitly makes -j2 work. +$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/xml/%.cpp : $(intermediates)/xml/%.h +#end + +# HTML tag and attribute names + +GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp $(intermediates)/JSHTMLElementWrapperFactory.cpp +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(html_tags) --attrs $(html_attrs) --factory --wrapperFactory --output $(dir $@) +$(GEN): html_tags := $(LOCAL_PATH)/html/HTMLTagNames.in +$(GEN): html_attrs := $(LOCAL_PATH)/html/HTMLAttributeNames.in +$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(html_tags) $(html_attrs) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + +# SVG tag and attribute names + +ifeq ($(ENABLE_SVG), true) +GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGElementFactory.cpp $(intermediates)/JSSVGElementWrapperFactory.cpp +SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1 +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(svg_tags) --attrs $(svg_attrs) --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@) +$(GEN): svg_tags := $(LOCAL_PATH)/svg/svgtags.in +$(GEN): svg_attrs := $(LOCAL_PATH)/svg/svgattrs.in +$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(svg_tags) $(svg_attrs) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) +endif + +# XML attribute names + +GEN:= $(intermediates)/XMLNames.cpp +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --attrs $(xml_attrs) --output $(dir $@) +$(GEN): xml_attrs := $(LOCAL_PATH)/xml/xmlattrs.in +$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(xml_attrs) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + +# XLink attribute names + +ifeq ($(ENABLE_SVG), true) +GEN:= $(intermediates)/XLinkNames.cpp +$(GEN): PRIVATE_PATH := $(LOCAL_PATH) +$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --attrs $(xlink_attrs) --output $(dir $@) +$(GEN): xlink_attrs := $(LOCAL_PATH)/svg/xlinkattrs.in +$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(xlink_attrs) + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) +endif diff --git a/WebCore/Android.mk b/WebCore/Android.mk index b447087..d1f0930 100644 --- a/WebCore/Android.mk +++ b/WebCore/Android.mk @@ -22,6 +22,19 @@ # LOCAL_SRC_FILES_EXCLUDED := \ # DerivedSources.cpp \ # WebCorePrefix.cpp \ +# bindings/js/JSCustomSQL*.cpp \ +# bindings/js/JSCustomVersionChangeCallback.cpp \ +# bindings/js/JSDatabaseCustom.cpp \ +# bindings/js/JSHTMLAudioElementConstructor.cpp \ +# bindings/js/JSSQL*.cpp \ +# bindings/js/JSStorageCustom.cpp \ +# bindings/js/JSXSLTProcessor*.cpp \ +# bindings/js/JSWorker*.cpp \ +# bindings/js/Worker*.cpp \ +# bindings/js/*Gtk.cpp \ +# bindings/js/*Qt.cpp \ +# bindings/js/*Win.cpp \ +# bindings/js/*Wx.cpp \ # bridge/test*.cpp \ # css/CSSGrammar.y \ # dom/Worker*.cpp \ @@ -102,6 +115,130 @@ # The remainder of the file is read by tools/webkitsync/diff.cpp # If you edit it, keep it in alphabetical order LOCAL_SRC_FILES := \ + bindings/js/GCController.cpp \ + bindings/js/JSAttrCustom.cpp \ + bindings/js/JSAudioConstructor.cpp \ + bindings/js/JSCDATASectionCustom.cpp \ + bindings/js/JSCSSRuleCustom.cpp \ + bindings/js/JSCSSStyleDeclarationCustom.cpp \ + bindings/js/JSCSSValueCustom.cpp \ + bindings/js/JSCanvasRenderingContext2DCustom.cpp \ + bindings/js/JSClipboardCustom.cpp \ + bindings/js/JSConsoleCustom.cpp \ + bindings/js/JSCustomPositionCallback.cpp \ + bindings/js/JSCustomPositionErrorCallback.cpp \ + bindings/js/JSCustomSQLStatementCallback.cpp \ + bindings/js/JSCustomSQLStatementErrorCallback.cpp \ + bindings/js/JSCustomSQLTransactionCallback.cpp \ + bindings/js/JSCustomSQLTransactionErrorCallback.cpp \ + bindings/js/JSCustomVoidCallback.cpp \ + bindings/js/JSCustomXPathNSResolver.cpp \ + bindings/js/JSDatabaseCustom.cpp \ + bindings/js/JSDOMApplicationCacheCustom.cpp \ + bindings/js/JSDOMBinding.cpp \ + bindings/js/JSDOMGlobalObject.cpp \ + bindings/js/JSDOMStringListCustom.cpp \ + bindings/js/JSDOMWindowBase.cpp \ + bindings/js/JSDOMWindowCustom.cpp \ + bindings/js/JSDOMWindowShell.cpp \ + bindings/js/JSDocumentCustom.cpp \ + bindings/js/JSDocumentFragmentCustom.cpp \ + bindings/js/JSElementCustom.cpp \ + bindings/js/JSEventCustom.cpp \ + bindings/js/JSEventListener.cpp \ + bindings/js/JSEventTarget.cpp \ + bindings/js/JSGeolocationCustom.cpp \ + bindings/js/JSHTMLAllCollection.cpp \ + bindings/js/JSHTMLAppletElementCustom.cpp \ + bindings/js/JSHTMLCollectionCustom.cpp \ + bindings/js/JSHTMLDocumentCustom.cpp \ + bindings/js/JSHTMLElementCustom.cpp \ + bindings/js/JSHTMLEmbedElementCustom.cpp \ + bindings/js/JSHTMLFormElementCustom.cpp \ + bindings/js/JSHTMLFrameElementCustom.cpp \ + bindings/js/JSHTMLFrameSetElementCustom.cpp \ + bindings/js/JSHTMLIFrameElementCustom.cpp \ + bindings/js/JSHTMLInputElementCustom.cpp \ + bindings/js/JSHTMLObjectElementCustom.cpp \ + bindings/js/JSHTMLOptionsCollectionCustom.cpp \ + bindings/js/JSHTMLSelectElementCustom.cpp \ + bindings/js/JSHistoryCustom.cpp \ + bindings/js/JSImageConstructor.cpp \ + bindings/js/JSImageDataCustom.cpp \ + bindings/js/JSInspectedObjectWrapper.cpp \ + bindings/js/JSInspectorCallbackWrapper.cpp \ + bindings/js/JSJavaScriptCallFrameCustom.cpp \ + bindings/js/JSLazyEventListener.cpp \ + bindings/js/JSLocationCustom.cpp \ + bindings/js/JSMessageChannelConstructor.cpp \ + bindings/js/JSMessageChannelCustom.cpp \ + bindings/js/JSMessagePortCustom.cpp \ + bindings/js/JSMimeTypeArrayCustom.cpp \ + bindings/js/JSNamedNodeMapCustom.cpp \ + bindings/js/JSNamedNodesCollection.cpp \ + bindings/js/JSNavigatorCustom.cpp \ + bindings/js/JSNodeCustom.cpp \ + bindings/js/JSNodeFilterCondition.cpp \ + bindings/js/JSNodeFilterCustom.cpp \ + bindings/js/JSNodeIteratorCustom.cpp \ + bindings/js/JSNodeListCustom.cpp \ + bindings/js/JSOptionConstructor.cpp \ + bindings/js/JSPluginArrayCustom.cpp \ + bindings/js/JSPluginCustom.cpp \ + bindings/js/JSPluginElementFunctions.cpp \ + bindings/js/JSQuarantinedObjectWrapper.cpp \ + bindings/js/JSRGBColor.cpp \ + bindings/js/JSSQLResultSetRowListCustom.cpp \ + bindings/js/JSSQLTransactionCustom.cpp \ + +ifeq ($(ENABLE_SVG), true) +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + bindings/js/JSSVGElementInstanceCustom.cpp \ + bindings/js/JSSVGLengthCustom.cpp \ + bindings/js/JSSVGMatrixCustom.cpp \ + bindings/js/JSSVGPathSegCustom.cpp \ + bindings/js/JSSVGPathSegListCustom.cpp \ + bindings/js/JSSVGPointListCustom.cpp \ + bindings/js/JSSVGTransformListCustom.cpp +endif + +LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ + bindings/js/JSStyleSheetCustom.cpp \ + bindings/js/JSStyleSheetListCustom.cpp \ + bindings/js/JSTextCustom.cpp \ + bindings/js/JSTreeWalkerCustom.cpp \ + bindings/js/JSWebKitCSSMatrixConstructor.cpp \ + bindings/js/JSWebKitPointConstructor.cpp \ + bindings/js/JSXMLHttpRequestConstructor.cpp \ + bindings/js/JSXMLHttpRequestCustom.cpp \ + bindings/js/JSXMLHttpRequestUploadCustom.cpp \ + bindings/js/ScheduledAction.cpp \ + bindings/js/ScriptCachedFrameData.cpp \ + bindings/js/ScriptCallFrame.cpp \ + bindings/js/ScriptCallStack.cpp \ + bindings/js/ScriptController.cpp \ + bindings/js/ScriptControllerAndroid.cpp \ + bindings/js/ScriptFunctionCall.cpp \ + bindings/js/ScriptObject.cpp \ + bindings/js/ScriptValue.cpp \ + \ + bridge/IdentifierRep.cpp \ + bridge/NP_jsobject.cpp \ + bridge/c/c_class.cpp \ + bridge/c/c_instance.cpp \ + bridge/c/c_runtime.cpp \ + bridge/c/c_utility.cpp \ + bridge/jni/jni_class.cpp \ + bridge/jni/jni_instance.cpp \ + bridge/jni/jni_runtime.cpp \ + bridge/jni/jni_utility.cpp \ + bridge/npruntime.cpp \ + bridge/runtime.cpp \ + bridge/runtime_array.cpp \ + bridge/runtime_method.cpp \ + bridge/runtime_object.cpp \ + bridge/runtime_root.cpp \ + \ css/CSSBorderImageValue.cpp \ css/CSSCanvasValue.cpp \ css/CSSCharsetRule.cpp \ @@ -576,6 +713,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/android/SharedBufferStream.cpp \ platform/graphics/android/android_graphics.cpp \ + ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/filters/FEBlend.cpp \ @@ -603,8 +741,8 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ platform/graphics/transforms/TransformationMatrix.cpp \ platform/graphics/transforms/TranslateTransformOperation.cpp \ \ - platform/image-decoders/skia/GIFImageDecoder.cpp \ - platform/image-decoders/skia/GIFImageReader.cpp \ + platform/image-decoders/skia/GIFImageDecoder.cpp \ + platform/image-decoders/skia/GIFImageReader.cpp \ \ platform/network/AuthenticationChallengeBase.cpp \ platform/network/Credential.cpp \ @@ -716,7 +854,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ rendering/RenderPartObject.cpp \ rendering/RenderPath.cpp \ rendering/RenderReplaced.cpp \ - rendering/RenderReplica.cpp + rendering/RenderReplica.cpp \ ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ diff --git a/WebCore/JavaScriptCore.derived.mk b/WebCore/JavaScriptCore.derived.mk deleted file mode 100644 index c2137d3..0000000 --- a/WebCore/JavaScriptCore.derived.mk +++ /dev/null @@ -1,702 +0,0 @@ -## -## -## Copyright 2007, The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## - -BINDING_C_INCLUDES := \ - $(BASE_PATH)/WebCore/bridge \ - $(BASE_PATH)/WebCore/bridge/c \ - $(BASE_PATH)/WebCore/bridge/jni \ - $(BASE_PATH)/WebCore/bindings/js \ - $(BASE_PATH)/JavaScriptCore \ - $(BASE_PATH)/JavaScriptCore/API \ - $(BASE_PATH)/JavaScriptCore/assembler \ - $(BASE_PATH)/JavaScriptCore/bytecode \ - $(BASE_PATH)/JavaScriptCore/bytecompiler \ - $(BASE_PATH)/JavaScriptCore/debugger \ - $(BASE_PATH)/JavaScriptCore/parser \ - $(BASE_PATH)/JavaScriptCore/jit \ - $(BASE_PATH)/JavaScriptCore/interpreter \ - $(BASE_PATH)/JavaScriptCore/pcre \ - $(BASE_PATH)/JavaScriptCore/profiler \ - $(BASE_PATH)/JavaScriptCore/runtime \ - $(BASE_PATH)/JavaScriptCore/wrec \ - $(BASE_PATH)/JavaScriptCore/ForwardingHeaders \ - $(base_intermediates)/JavaScriptCore/parser \ - $(base_intermediates)/JavaScriptCore/runtime \ - $(base_intermediates)/WebCore/bindings/js - - -# This comment block is read by tools/webkitsync/diff.cpp -# Don't remove it or move it. -# - -# The following files are intentionally not included -# LOCAL_SRC_FILES_EXCLUDED := \ -# bindings/js/JSCustomVersionChangeCallback.cpp \ -# bindings/js/JSHTMLAudioElementConstructor.cpp \ -# bindings/js/JSXSLTProcessor*.cpp \ -# bindings/js/JSWorker*.cpp \ -# bindings/js/Worker*.cpp \ -# bindings/js/*Gtk.cpp \ -# bindings/js/*Qt.cpp \ -# bindings/js/*Win.cpp \ -# bindings/js/*Wx.cpp \ - -LOCAL_SRC_FILES := \ - bindings/js/GCController.cpp \ - bindings/js/JSAttrCustom.cpp \ - bindings/js/JSAudioConstructor.cpp \ - bindings/js/JSCDATASectionCustom.cpp \ - bindings/js/JSCSSRuleCustom.cpp \ - bindings/js/JSCSSStyleDeclarationCustom.cpp \ - bindings/js/JSCSSValueCustom.cpp \ - bindings/js/JSCanvasRenderingContext2DCustom.cpp \ - bindings/js/JSClipboardCustom.cpp \ - bindings/js/JSConsoleCustom.cpp \ - bindings/js/JSCustomPositionCallback.cpp \ - bindings/js/JSCustomPositionErrorCallback.cpp \ - bindings/js/JSCustomSQLStatementCallback.cpp \ - bindings/js/JSCustomSQLStatementErrorCallback.cpp \ - bindings/js/JSCustomSQLTransactionCallback.cpp \ - bindings/js/JSCustomSQLTransactionErrorCallback.cpp \ - bindings/js/JSCustomVoidCallback.cpp \ - bindings/js/JSCustomXPathNSResolver.cpp \ - bindings/js/JSDatabaseCustom.cpp \ - bindings/js/JSDOMApplicationCacheCustom.cpp \ - bindings/js/JSDOMBinding.cpp \ - bindings/js/JSDOMGlobalObject.cpp \ - bindings/js/JSDOMStringListCustom.cpp \ - bindings/js/JSDOMWindowBase.cpp \ - bindings/js/JSDOMWindowCustom.cpp \ - bindings/js/JSDOMWindowShell.cpp \ - bindings/js/JSDocumentCustom.cpp \ - bindings/js/JSDocumentFragmentCustom.cpp \ - bindings/js/JSElementCustom.cpp \ - bindings/js/JSEventCustom.cpp \ - bindings/js/JSEventListener.cpp \ - bindings/js/JSEventTarget.cpp \ - bindings/js/JSGeolocationCustom.cpp \ - bindings/js/JSHTMLAllCollection.cpp \ - bindings/js/JSHTMLAppletElementCustom.cpp \ - bindings/js/JSHTMLCollectionCustom.cpp \ - bindings/js/JSHTMLDocumentCustom.cpp \ - bindings/js/JSHTMLElementCustom.cpp \ - bindings/js/JSHTMLEmbedElementCustom.cpp \ - bindings/js/JSHTMLFormElementCustom.cpp \ - bindings/js/JSHTMLFrameElementCustom.cpp \ - bindings/js/JSHTMLFrameSetElementCustom.cpp \ - bindings/js/JSHTMLIFrameElementCustom.cpp \ - bindings/js/JSHTMLInputElementCustom.cpp \ - bindings/js/JSHTMLObjectElementCustom.cpp \ - bindings/js/JSHTMLOptionsCollectionCustom.cpp \ - bindings/js/JSHTMLSelectElementCustom.cpp \ - bindings/js/JSHistoryCustom.cpp \ - bindings/js/JSImageConstructor.cpp \ - bindings/js/JSImageDataCustom.cpp \ - bindings/js/JSInspectedObjectWrapper.cpp \ - bindings/js/JSInspectorCallbackWrapper.cpp \ - bindings/js/JSJavaScriptCallFrameCustom.cpp \ - bindings/js/JSLazyEventListener.cpp \ - bindings/js/JSLocationCustom.cpp \ - bindings/js/JSMessageChannelConstructor.cpp \ - bindings/js/JSMessageChannelCustom.cpp \ - bindings/js/JSMessagePortCustom.cpp \ - bindings/js/JSMimeTypeArrayCustom.cpp \ - bindings/js/JSNamedNodeMapCustom.cpp \ - bindings/js/JSNamedNodesCollection.cpp \ - bindings/js/JSNavigatorCustom.cpp \ - bindings/js/JSNodeCustom.cpp \ - bindings/js/JSNodeFilterCondition.cpp \ - bindings/js/JSNodeFilterCustom.cpp \ - bindings/js/JSNodeIteratorCustom.cpp \ - bindings/js/JSNodeListCustom.cpp \ - bindings/js/JSOptionConstructor.cpp \ - bindings/js/JSPluginArrayCustom.cpp \ - bindings/js/JSPluginCustom.cpp \ - bindings/js/JSPluginElementFunctions.cpp \ - bindings/js/JSQuarantinedObjectWrapper.cpp \ - bindings/js/JSRGBColor.cpp \ - bindings/js/JSSQLResultSetRowListCustom.cpp \ - bindings/js/JSSQLTransactionCustom.cpp \ - -ifeq ($(ENABLE_SVG), true) -LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - bindings/js/JSSVGElementInstanceCustom.cpp \ - bindings/js/JSSVGLengthCustom.cpp \ - bindings/js/JSSVGMatrixCustom.cpp \ - bindings/js/JSSVGPathSegCustom.cpp \ - bindings/js/JSSVGPathSegListCustom.cpp \ - bindings/js/JSSVGPointListCustom.cpp \ - bindings/js/JSSVGTransformListCustom.cpp -endif - -LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ - bindings/js/JSStyleSheetCustom.cpp \ - bindings/js/JSStyleSheetListCustom.cpp \ - bindings/js/JSTextCustom.cpp \ - bindings/js/JSTreeWalkerCustom.cpp \ - bindings/js/JSWebKitCSSMatrixConstructor.cpp \ - bindings/js/JSWebKitPointConstructor.cpp \ - bindings/js/JSXMLHttpRequestConstructor.cpp \ - bindings/js/JSXMLHttpRequestCustom.cpp \ - bindings/js/JSXMLHttpRequestUploadCustom.cpp \ - bindings/js/ScheduledAction.cpp \ - bindings/js/ScriptCachedFrameData.cpp \ - bindings/js/ScriptCallFrame.cpp \ - bindings/js/ScriptCallStack.cpp \ - bindings/js/ScriptController.cpp \ - bindings/js/ScriptControllerAndroid.cpp \ - bindings/js/ScriptFunctionCall.cpp \ - bindings/js/ScriptObject.cpp \ - bindings/js/ScriptValue.cpp \ - \ - bridge/IdentifierRep.cpp \ - bridge/NP_jsobject.cpp \ - bridge/c/c_class.cpp \ - bridge/c/c_instance.cpp \ - bridge/c/c_runtime.cpp \ - bridge/c/c_utility.cpp \ - bridge/jni/jni_class.cpp \ - bridge/jni/jni_instance.cpp \ - bridge/jni/jni_runtime.cpp \ - bridge/jni/jni_utility.cpp \ - bridge/npruntime.cpp \ - bridge/runtime.cpp \ - bridge/runtime_array.cpp \ - bridge/runtime_method.cpp \ - bridge/runtime_object.cpp \ - bridge/runtime_root.cpp - - -# lookup tables for old-style JavaScript bindings -create_hash_table := $(LOCAL_PATH)/../JavaScriptCore/create_hash_table - -GEN := $(addprefix $(intermediates)/, \ - bindings/js/JSDOMWindowBase.lut.h \ - bindings/js/JSRGBColor.lut.h \ - ) -$(GEN): PRIVATE_CUSTOM_TOOL = perl $(create_hash_table) $< > $@ -$(GEN): $(intermediates)/bindings/js/%.lut.h: $(LOCAL_PATH)/bindings/js/%.cpp $(create_hash_table) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - - -GEN := $(intermediates)/bindings/js/JSHTMLInputElementBaseTable.cpp -$(GEN): PRIVATE_CUSTOM_TOOL = perl $(create_hash_table) $< > $@ -$(GEN): $(intermediates)/bindings/js/%Table.cpp: $(LOCAL_PATH)/bindings/js/%.cpp $(create_hash_table) - $(transform-generated-source) -$(intermediates)/bindings/js/JSHTMLInputElementBase.o : $(GEN) - -# lookup tables for old-style JavaScript bindings -js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\ - bindings/scripts/CodeGenerator.pm \ - bindings/scripts/IDLParser.pm \ - bindings/scripts/IDLStructure.pm \ - bindings/scripts/generate-bindings.pl \ - ) - -FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1 ENABLE_DATABASE=1 ENABLE_OFFLINE_WEB_APPLICATIONS=1 - -GEN := \ - $(intermediates)/css/JSCSSCharsetRule.h \ - $(intermediates)/css/JSCSSFontFaceRule.h \ - $(intermediates)/css/JSCSSImportRule.h \ - $(intermediates)/css/JSCSSMediaRule.h \ - $(intermediates)/css/JSCSSPageRule.h \ - $(intermediates)/css/JSCSSPrimitiveValue.h \ - $(intermediates)/css/JSCSSRule.h \ - $(intermediates)/css/JSCSSRuleList.h \ - $(intermediates)/css/JSCSSStyleDeclaration.h \ - $(intermediates)/css/JSCSSStyleRule.h \ - $(intermediates)/css/JSCSSStyleSheet.h \ - $(intermediates)/css/JSCSSUnknownRule.h \ - $(intermediates)/css/JSCSSValue.h \ - $(intermediates)/css/JSCSSValueList.h \ - $(intermediates)/css/JSCSSVariablesDeclaration.h \ - $(intermediates)/css/JSCSSVariablesRule.h \ - $(intermediates)/css/JSCounter.h \ - $(intermediates)/css/JSMediaList.h \ - $(intermediates)/css/JSRect.h \ - $(intermediates)/css/JSStyleSheet.h \ - $(intermediates)/css/JSStyleSheetList.h \ - $(intermediates)/css/JSWebKitCSSKeyframeRule.h \ - $(intermediates)/css/JSWebKitCSSKeyframesRule.h \ - $(intermediates)/css/JSWebKitCSSMatrix.h \ - $(intermediates)/css/JSWebKitCSSTransformValue.h -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/css/JS%.h : $(LOCAL_PATH)/css/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/css/%.cpp : $(intermediates)/css/%.h - -# MANUAL MERGE : I took this out because compiling the result shows: -# out/.../JSEventTarget.cpp: In function 'JSC::JSValue* WebCore::jsEventTargetPrototypeFunctionAddEventListener(JSC::ExecState*, JSC::JSObject*, JSC::JSValue*, const JSC::ArgList&)': -# out/.../JSEventTarget.cpp:90: error: 'toEventListener' was not declared in this scope -# but I can't find toEventListener anywhere, nor can I figure out how toEventListener -# is generated -# $(intermediates)/dom/JSEventTarget.h \ - -GEN := \ - $(intermediates)/dom/JSAttr.h \ - $(intermediates)/dom/JSCDATASection.h \ - $(intermediates)/dom/JSCharacterData.h \ - $(intermediates)/dom/JSClientRect.h \ - $(intermediates)/dom/JSClientRectList.h \ - $(intermediates)/dom/JSClipboard.h \ - $(intermediates)/dom/JSComment.h \ - $(intermediates)/dom/JSDOMCoreException.h \ - $(intermediates)/dom/JSDOMImplementation.h \ - $(intermediates)/dom/JSDOMStringList.h \ - $(intermediates)/dom/JSDocument.h \ - $(intermediates)/dom/JSDocumentFragment.h \ - $(intermediates)/dom/JSDocumentType.h \ - $(intermediates)/dom/JSElement.h \ - $(intermediates)/dom/JSEntity.h \ - $(intermediates)/dom/JSEntityReference.h \ - $(intermediates)/dom/JSEvent.h \ - $(intermediates)/dom/JSEventException.h \ - $(intermediates)/dom/JSKeyboardEvent.h \ - $(intermediates)/dom/JSMessageChannel.h \ - $(intermediates)/dom/JSMessageEvent.h \ - $(intermediates)/dom/JSMessagePort.h \ - $(intermediates)/dom/JSMouseEvent.h \ - $(intermediates)/dom/JSMutationEvent.h \ - $(intermediates)/dom/JSNamedNodeMap.h \ - $(intermediates)/dom/JSNode.h \ - $(intermediates)/dom/JSNodeFilter.h \ - $(intermediates)/dom/JSNodeIterator.h \ - $(intermediates)/dom/JSNodeList.h \ - $(intermediates)/dom/JSNotation.h \ - $(intermediates)/dom/JSOverflowEvent.h \ - $(intermediates)/dom/JSProcessingInstruction.h \ - $(intermediates)/dom/JSProgressEvent.h \ - $(intermediates)/dom/JSRange.h \ - $(intermediates)/dom/JSRangeException.h \ - $(intermediates)/dom/JSText.h \ - $(intermediates)/dom/JSTextEvent.h \ - $(intermediates)/dom/JSTouch.h \ - $(intermediates)/dom/JSTouchEvent.h \ - $(intermediates)/dom/JSTouchList.h \ - $(intermediates)/dom/JSTreeWalker.h \ - $(intermediates)/dom/JSUIEvent.h \ - $(intermediates)/dom/JSWebKitAnimationEvent.h \ - $(intermediates)/dom/JSWebKitTransitionEvent.h \ - $(intermediates)/dom/JSWheelEvent.h -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/dom/JS%.h : $(LOCAL_PATH)/dom/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/dom/%.cpp : $(intermediates)/dom/%.h - - -GEN := \ - $(intermediates)/html/JSCanvasGradient.h \ - $(intermediates)/html/JSCanvasPattern.h \ - $(intermediates)/html/JSCanvasRenderingContext2D.h \ - $(intermediates)/html/JSFile.h \ - $(intermediates)/html/JSFileList.h \ - $(intermediates)/html/JSHTMLAnchorElement.h \ - $(intermediates)/html/JSHTMLAppletElement.h \ - $(intermediates)/html/JSHTMLAreaElement.h \ - $(intermediates)/html/JSHTMLBRElement.h \ - $(intermediates)/html/JSHTMLBaseElement.h \ - $(intermediates)/html/JSHTMLBaseFontElement.h \ - $(intermediates)/html/JSHTMLBlockquoteElement.h \ - $(intermediates)/html/JSHTMLBodyElement.h \ - $(intermediates)/html/JSHTMLButtonElement.h \ - $(intermediates)/html/JSHTMLCanvasElement.h \ - $(intermediates)/html/JSHTMLCollection.h \ - $(intermediates)/html/JSHTMLDListElement.h \ - $(intermediates)/html/JSHTMLDirectoryElement.h \ - $(intermediates)/html/JSHTMLDivElement.h \ - $(intermediates)/html/JSHTMLDocument.h \ - $(intermediates)/html/JSHTMLElement.h \ - $(intermediates)/html/JSHTMLEmbedElement.h \ - $(intermediates)/html/JSHTMLFieldSetElement.h \ - $(intermediates)/html/JSHTMLFontElement.h \ - $(intermediates)/html/JSHTMLFormElement.h \ - $(intermediates)/html/JSHTMLFrameElement.h \ - $(intermediates)/html/JSHTMLFrameSetElement.h \ - $(intermediates)/html/JSHTMLHRElement.h \ - $(intermediates)/html/JSHTMLHeadElement.h \ - $(intermediates)/html/JSHTMLHeadingElement.h \ - $(intermediates)/html/JSHTMLHtmlElement.h \ - $(intermediates)/html/JSHTMLIFrameElement.h \ - $(intermediates)/html/JSHTMLImageElement.h \ - $(intermediates)/html/JSHTMLInputElement.h \ - $(intermediates)/html/JSHTMLIsIndexElement.h \ - $(intermediates)/html/JSHTMLLIElement.h \ - $(intermediates)/html/JSHTMLLabelElement.h \ - $(intermediates)/html/JSHTMLLegendElement.h \ - $(intermediates)/html/JSHTMLLinkElement.h \ - $(intermediates)/html/JSHTMLMapElement.h \ - $(intermediates)/html/JSHTMLMarqueeElement.h \ - $(intermediates)/html/JSHTMLMenuElement.h \ - $(intermediates)/html/JSHTMLMetaElement.h \ - $(intermediates)/html/JSHTMLModElement.h \ - $(intermediates)/html/JSHTMLOListElement.h \ - $(intermediates)/html/JSHTMLObjectElement.h \ - $(intermediates)/html/JSHTMLOptGroupElement.h \ - $(intermediates)/html/JSHTMLOptionElement.h \ - $(intermediates)/html/JSHTMLOptionsCollection.h \ - $(intermediates)/html/JSHTMLParagraphElement.h \ - $(intermediates)/html/JSHTMLParamElement.h \ - $(intermediates)/html/JSHTMLPreElement.h \ - $(intermediates)/html/JSHTMLQuoteElement.h \ - $(intermediates)/html/JSHTMLScriptElement.h \ - $(intermediates)/html/JSHTMLSelectElement.h \ - $(intermediates)/html/JSHTMLSourceElement.h \ - $(intermediates)/html/JSHTMLStyleElement.h \ - $(intermediates)/html/JSHTMLTableCaptionElement.h \ - $(intermediates)/html/JSHTMLTableCellElement.h \ - $(intermediates)/html/JSHTMLTableColElement.h \ - $(intermediates)/html/JSHTMLTableElement.h \ - $(intermediates)/html/JSHTMLTableRowElement.h \ - $(intermediates)/html/JSHTMLTableSectionElement.h \ - $(intermediates)/html/JSHTMLTextAreaElement.h \ - $(intermediates)/html/JSHTMLTitleElement.h \ - $(intermediates)/html/JSHTMLUListElement.h \ - $(intermediates)/html/JSHTMLVideoElement.h \ - $(intermediates)/html/JSImageData.h \ - $(intermediates)/html/JSMediaError.h \ - $(intermediates)/html/JSTextMetrics.h \ - $(intermediates)/html/JSTimeRanges.h \ - $(intermediates)/html/JSVoidCallback.h - -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/html/JS%.h : $(LOCAL_PATH)/html/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/html/%.cpp : $(intermediates)/html/%.h - -GEN := \ - $(intermediates)/inspector/JSJavaScriptCallFrame.h - -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/inspector/JS%.h : $(LOCAL_PATH)/inspector/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/inspector/%.cpp : $(intermediates)/inspector/%.h - -GEN := \ - $(intermediates)/loader/appcache/JSDOMApplicationCache.h - -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/loader/appcache/JS%.h : $(LOCAL_PATH)/loader/appcache/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/loader/appcache/%.cpp : $(intermediates)/loader/appcache/%.h - -# MANUAL MERGE : I took this out because compiling the result shows: -# out/.../JSAbstractView.cpp:27:26: error: AbstractView.h: No such file or directory -# I can't find AbstractView.h anywhere -# $(intermediates)/page/JSAbstractView.h \ -# -# also: -# -# out/.../JSPositionCallback.cpp:145: error: no matching function for call to 'WebCore::PositionCallback::handleEvent(WebCore::Geoposition*&)' -# note: candidates are: virtual void WebCore::PositionCallback::handleEvent(WebCore::Geoposition*, bool&) -# $(intermediates)/page/JSPositionCallback.h \ - -GEN := \ - $(intermediates)/page/JSBarInfo.h \ - $(intermediates)/page/JSConsole.h \ - $(intermediates)/page/JSCoordinates.h \ - $(intermediates)/page/JSDOMSelection.h \ - $(intermediates)/page/JSDOMWindow.h \ - $(intermediates)/page/JSGeolocation.h \ - $(intermediates)/page/JSGeoposition.h \ - $(intermediates)/page/JSHistory.h \ - $(intermediates)/page/JSLocation.h \ - $(intermediates)/page/JSNavigator.h \ - $(intermediates)/page/JSPositionError.h \ - $(intermediates)/page/JSPositionErrorCallback.h \ - $(intermediates)/page/JSScreen.h \ - $(intermediates)/page/JSWebKitPoint.h -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/page/JS%.h : $(LOCAL_PATH)/page/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/page/%.cpp : $(intermediates)/page/%.h - -GEN := \ - $(intermediates)/plugins/JSMimeType.h \ - $(intermediates)/plugins/JSMimeTypeArray.h \ - $(intermediates)/plugins/JSPlugin.h \ - $(intermediates)/plugins/JSPluginArray.h - -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/plugins/JS%.h : $(LOCAL_PATH)/plugins/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/plugins/%.cpp : $(intermediates)/plugins/%.h - -# New section for Database storage API -GEN := \ - $(intermediates)/storage/JSDatabase.h \ - $(intermediates)/storage/JSSQLError.h \ - $(intermediates)/storage/JSSQLResultSet.h \ - $(intermediates)/storage/JSSQLResultSetRowList.h \ - $(intermediates)/storage/JSSQLTransaction.h - -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/storage/JS%.h : $(LOCAL_PATH)/storage/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/storage/%.cpp : $(intermediates)/storage/%.h - -#new section for svg -ifeq ($(ENABLE_SVG), true) -GEN := \ - $(intermediates)/svg/JSSVGAElement.h \ - $(intermediates)/svg/JSSVGAltGlyphElement.h \ - $(intermediates)/svg/JSSVGAngle.h \ - $(intermediates)/svg/JSSVGAnimateColorElement.h \ - $(intermediates)/svg/JSSVGAnimateElement.h \ - $(intermediates)/svg/JSSVGAnimateTransformElement.h \ - $(intermediates)/svg/JSSVGAnimatedAngle.h \ - $(intermediates)/svg/JSSVGAnimatedBoolean.h \ - $(intermediates)/svg/JSSVGAnimatedEnumeration.h \ - $(intermediates)/svg/JSSVGAnimatedInteger.h \ - $(intermediates)/svg/JSSVGAnimatedLength.h \ - $(intermediates)/svg/JSSVGAnimatedLengthList.h \ - $(intermediates)/svg/JSSVGAnimatedNumber.h \ - $(intermediates)/svg/JSSVGAnimatedNumberList.h \ - $(intermediates)/svg/JSSVGAnimatedPreserveAspectRatio.h \ - $(intermediates)/svg/JSSVGAnimatedRect.h \ - $(intermediates)/svg/JSSVGAnimatedString.h \ - $(intermediates)/svg/JSSVGAnimatedTransformList.h \ - $(intermediates)/svg/JSSVGAnimationElement.h \ - $(intermediates)/svg/JSSVGCircleElement.h \ - $(intermediates)/svg/JSSVGClipPathElement.h \ - $(intermediates)/svg/JSSVGColor.h \ - $(intermediates)/svg/JSSVGComponentTransferFunctionElement.h \ - $(intermediates)/svg/JSSVGCursorElement.h \ - $(intermediates)/svg/JSSVGDefinitionSrcElement.h \ - $(intermediates)/svg/JSSVGDefsElement.h \ - $(intermediates)/svg/JSSVGDescElement.h \ - $(intermediates)/svg/JSSVGDocument.h \ - $(intermediates)/svg/JSSVGElement.h \ - $(intermediates)/svg/JSSVGElementInstance.h \ - $(intermediates)/svg/JSSVGElementInstanceList.h \ - $(intermediates)/svg/JSSVGEllipseElement.h \ - $(intermediates)/svg/JSSVGException.h \ - $(intermediates)/svg/JSSVGFEBlendElement.h \ - $(intermediates)/svg/JSSVGFEColorMatrixElement.h \ - $(intermediates)/svg/JSSVGFEComponentTransferElement.h \ - $(intermediates)/svg/JSSVGFECompositeElement.h \ - $(intermediates)/svg/JSSVGFEDiffuseLightingElement.h \ - $(intermediates)/svg/JSSVGFEDisplacementMapElement.h \ - $(intermediates)/svg/JSSVGFEDistantLightElement.h \ - $(intermediates)/svg/JSSVGFEFloodElement.h \ - $(intermediates)/svg/JSSVGFEFuncAElement.h \ - $(intermediates)/svg/JSSVGFEFuncBElement.h \ - $(intermediates)/svg/JSSVGFEFuncGElement.h \ - $(intermediates)/svg/JSSVGFEFuncRElement.h \ - $(intermediates)/svg/JSSVGFEGaussianBlurElement.h \ - $(intermediates)/svg/JSSVGFEImageElement.h \ - $(intermediates)/svg/JSSVGFEMergeElement.h \ - $(intermediates)/svg/JSSVGFEMergeNodeElement.h \ - $(intermediates)/svg/JSSVGFEOffsetElement.h \ - $(intermediates)/svg/JSSVGFEPointLightElement.h \ - $(intermediates)/svg/JSSVGFESpecularLightingElement.h \ - $(intermediates)/svg/JSSVGFESpotLightElement.h \ - $(intermediates)/svg/JSSVGFETileElement.h \ - $(intermediates)/svg/JSSVGFETurbulenceElement.h \ - $(intermediates)/svg/JSSVGFilterElement.h \ - $(intermediates)/svg/JSSVGFontElement.h \ - $(intermediates)/svg/JSSVGFontFaceElement.h \ - $(intermediates)/svg/JSSVGFontFaceFormatElement.h \ - $(intermediates)/svg/JSSVGFontFaceNameElement.h \ - $(intermediates)/svg/JSSVGFontFaceSrcElement.h \ - $(intermediates)/svg/JSSVGFontFaceUriElement.h \ - $(intermediates)/svg/JSSVGForeignObjectElement.h \ - $(intermediates)/svg/JSSVGGElement.h \ - $(intermediates)/svg/JSSVGGlyphElement.h \ - $(intermediates)/svg/JSSVGGradientElement.h \ - $(intermediates)/svg/JSSVGHKernElement.h \ - $(intermediates)/svg/JSSVGImageElement.h \ - $(intermediates)/svg/JSSVGLength.h \ - $(intermediates)/svg/JSSVGLengthList.h \ - $(intermediates)/svg/JSSVGLineElement.h \ - $(intermediates)/svg/JSSVGLinearGradientElement.h \ - $(intermediates)/svg/JSSVGMarkerElement.h \ - $(intermediates)/svg/JSSVGMaskElement.h \ - $(intermediates)/svg/JSSVGMatrix.h \ - $(intermediates)/svg/JSSVGMetadataElement.h \ - $(intermediates)/svg/JSSVGMissingGlyphElement.h \ - $(intermediates)/svg/JSSVGNumber.h \ - $(intermediates)/svg/JSSVGNumberList.h \ - $(intermediates)/svg/JSSVGPaint.h \ - $(intermediates)/svg/JSSVGPathElement.h \ - $(intermediates)/svg/JSSVGPathSeg.h \ - $(intermediates)/svg/JSSVGPathSegArcAbs.h \ - $(intermediates)/svg/JSSVGPathSegArcRel.h \ - $(intermediates)/svg/JSSVGPathSegClosePath.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoCubicAbs.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoCubicRel.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoCubicSmoothAbs.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoCubicSmoothRel.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticAbs.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticRel.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticSmoothAbs.h \ - $(intermediates)/svg/JSSVGPathSegCurvetoQuadraticSmoothRel.h \ - $(intermediates)/svg/JSSVGPathSegLinetoAbs.h \ - $(intermediates)/svg/JSSVGPathSegLinetoHorizontalAbs.h \ - $(intermediates)/svg/JSSVGPathSegLinetoHorizontalRel.h \ - $(intermediates)/svg/JSSVGPathSegLinetoRel.h \ - $(intermediates)/svg/JSSVGPathSegLinetoVerticalAbs.h \ - $(intermediates)/svg/JSSVGPathSegLinetoVerticalRel.h \ - $(intermediates)/svg/JSSVGPathSegList.h \ - $(intermediates)/svg/JSSVGPathSegMovetoAbs.h \ - $(intermediates)/svg/JSSVGPathSegMovetoRel.h \ - $(intermediates)/svg/JSSVGPatternElement.h \ - $(intermediates)/svg/JSSVGPoint.h \ - $(intermediates)/svg/JSSVGPointList.h \ - $(intermediates)/svg/JSSVGPolygonElement.h \ - $(intermediates)/svg/JSSVGPolylineElement.h \ - $(intermediates)/svg/JSSVGPreserveAspectRatio.h \ - $(intermediates)/svg/JSSVGRadialGradientElement.h \ - $(intermediates)/svg/JSSVGRect.h \ - $(intermediates)/svg/JSSVGRectElement.h \ - $(intermediates)/svg/JSSVGRenderingIntent.h \ - $(intermediates)/svg/JSSVGSVGElement.h \ - $(intermediates)/svg/JSSVGScriptElement.h \ - $(intermediates)/svg/JSSVGSetElement.h \ - $(intermediates)/svg/JSSVGStopElement.h \ - $(intermediates)/svg/JSSVGStringList.h \ - $(intermediates)/svg/JSSVGStyleElement.h \ - $(intermediates)/svg/JSSVGSwitchElement.h \ - $(intermediates)/svg/JSSVGSymbolElement.h \ - $(intermediates)/svg/JSSVGTRefElement.h \ - $(intermediates)/svg/JSSVGTSpanElement.h \ - $(intermediates)/svg/JSSVGTextContentElement.h \ - $(intermediates)/svg/JSSVGTextElement.h \ - $(intermediates)/svg/JSSVGTextPathElement.h \ - $(intermediates)/svg/JSSVGTextPositioningElement.h \ - $(intermediates)/svg/JSSVGTitleElement.h \ - $(intermediates)/svg/JSSVGTransform.h \ - $(intermediates)/svg/JSSVGTransformList.h \ - $(intermediates)/svg/JSSVGUnitTypes.h \ - $(intermediates)/svg/JSSVGUseElement.h \ - $(intermediates)/svg/JSSVGViewElement.h \ - $(intermediates)/svg/JSSVGZoomEvent.h -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include external/webkit/WebCore/dom --include external/webkit/WebCore/html --include external/webkit/WebCore/svg --outputdir $(dir $@) $< -$(GEN): $(intermediates)/svg/JS%.h : $(LOCAL_PATH)/svg/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/svg/%.cpp : $(intermediates)/svg/%.h -endif - -#new section for xml/DOMParser.idl -GEN := \ - $(intermediates)/xml/JSDOMParser.h \ - $(intermediates)/xml/JSXMLHttpRequest.h \ - $(intermediates)/xml/JSXMLHttpRequestException.h \ - $(intermediates)/xml/JSXMLHttpRequestProgressEvent.h \ - $(intermediates)/xml/JSXMLHttpRequestUpload.h \ - $(intermediates)/xml/JSXMLSerializer.h \ - $(intermediates)/xml/JSXPathEvaluator.h \ - $(intermediates)/xml/JSXPathException.h \ - $(intermediates)/xml/JSXPathExpression.h \ - $(intermediates)/xml/JSXPathNSResolver.h \ - $(intermediates)/xml/JSXPathResult.h \ - $(intermediates)/xml/JSXSLTProcessor.h -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I$(PRIVATE_PATH)/bindings/scripts $(PRIVATE_PATH)/bindings/scripts/generate-bindings.pl --defines "$(FEATURE_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --include dom --include html --outputdir $(dir $@) $< -$(GEN): $(intermediates)/xml/JS%.h : $(LOCAL_PATH)/xml/%.idl $(js_binding_scripts) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) $(GEN:%.h=%.cpp) - -# We also need the .cpp files, which are generated as side effects of the -# above rules. Specifying this explicitly makes -j2 work. -$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/xml/%.cpp : $(intermediates)/xml/%.h -#end - -# HTML tag and attribute names - -GEN:= $(intermediates)/HTMLNames.cpp $(intermediates)/HTMLElementFactory.cpp $(intermediates)/JSHTMLElementWrapperFactory.cpp -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(html_tags) --attrs $(html_attrs) --factory --wrapperFactory --output $(dir $@) -$(GEN): html_tags := $(LOCAL_PATH)/html/HTMLTagNames.in -$(GEN): html_attrs := $(LOCAL_PATH)/html/HTMLAttributeNames.in -$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(html_tags) $(html_attrs) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) - -# SVG tag and attribute names - -ifeq ($(ENABLE_SVG), true) -GEN:= $(intermediates)/SVGNames.cpp $(intermediates)/SVGElementFactory.cpp $(intermediates)/JSSVGElementWrapperFactory.cpp -SVG_FLAGS:=ENABLE_SVG_AS_IMAGE=1 ENABLE_SVG_FILTERS=1 ENABLE_SVG_FONTS=1 ENABLE_SVG_FOREIGN_OBJECT=1 ENABLE_SVG_USE=1 -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --tags $(svg_tags) --attrs $(svg_attrs) --extraDefines "$(SVG_FLAGS)" --factory --wrapperFactory --output $(dir $@) -$(GEN): svg_tags := $(LOCAL_PATH)/svg/svgtags.in -$(GEN): svg_attrs := $(LOCAL_PATH)/svg/svgattrs.in -$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(svg_tags) $(svg_attrs) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -endif - -# XLink attribute names - -ifeq ($(ENABLE_SVG), true) -GEN:= $(intermediates)/XLinkNames.cpp -$(GEN): PRIVATE_PATH := $(LOCAL_PATH) -$(GEN): PRIVATE_CUSTOM_TOOL = perl -I $(PRIVATE_PATH)/bindings/scripts $< --attrs $(xlink_attrs) --output $(dir $@) -$(GEN): xlink_attrs := $(LOCAL_PATH)/svg/xlinkattrs.in -$(GEN): $(LOCAL_PATH)/dom/make_names.pl $(xlink_attrs) - $(transform-generated-source) -LOCAL_GENERATED_SOURCES += $(GEN) -endif - |