From 2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 13 Nov 2009 20:36:38 +0000 Subject: Factors out common code from JSC and V8 Makefiles, ready for upstreaming to webkit.org. Both the JSC and V8 builds use Android.mk, WebCore/Android.mk and WebCore/Android.derived.mk. The JSC build also uses WebCore/Android.jscbindings.mk and WebCore/Android.derived.jscbindings.mk. The V8 build also uses V8Bindings/V8Binding.derived.mk. Change details ... Android.mk - Added content from both Android.jsc.mk and Android.v8.mk and removed these files. Added ifdefs to switch between two builds. WebCore/Android.mk - Moved JSC bindings code to WebCore/Android.jscbindings.mk. This file is now functionally identical to WebCore/Android.v8.mk, which was removed. WebCore/Android.derived.mk - Moved JSC bindings code to WebCore/Android.derived.jscbindings.mk. This file is now functionally identical to WebCore/Android.v8.derived.mk, which was removed. Also updates copyright dates, as per WebKit requirements. Change-Id: I92377b60f6f63c57283c316a2c7c2c64a13dc7de --- Android.jsc.mk | 288 --------------------------------------------------------- 1 file changed, 288 deletions(-) delete mode 100644 Android.jsc.mk (limited to 'Android.jsc.mk') diff --git a/Android.jsc.mk b/Android.jsc.mk deleted file mode 100644 index 0dd49b1..0000000 --- a/Android.jsc.mk +++ /dev/null @@ -1,288 +0,0 @@ -## -## Copyright 2007, The Android Open Source Project -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in the -## documentation and/or other materials provided with the distribution. -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY -## EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -## IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -## PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -## CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -## EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -## PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -## OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -## - -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 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 "WebCorePrefix.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 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/accessibility \ - $(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/html/canvas \ - $(LOCAL_PATH)/WebCore/inspector \ - $(LOCAL_PATH)/WebCore/loader \ - $(LOCAL_PATH)/WebCore/loader/appcache \ - $(LOCAL_PATH)/WebCore/loader/icon \ - $(LOCAL_PATH)/WebCore/notifications \ - $(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/mock \ - $(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)/WebCore/ \ - $(base_intermediates)/WebCore/bindings/js \ - $(base_intermediates)/WebCore/css \ - $(base_intermediates)/WebCore/dom \ - $(base_intermediates)/WebCore/html \ - $(base_intermediates)/WebCore/html/canvas \ - $(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/workers \ - $(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 \ - libskia \ - libutils \ - libui \ - libcutils \ - libicuuc \ - libicudata \ - libicui18n \ - libmedia - -ifeq ($(WEBCORE_INSTRUMENTATION),true) -LOCAL_SHARED_LIBRARIES += libhardware_legacy -endif - -# 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 libjs as a static library. -include $(CLEAR_VARS) -LOCAL_MODULE := libjs -LOCAL_LDLIBS := $(WEBKIT_LDLIBS) -LOCAL_SHARED_LIBRARIES := $(WEBKIT_SHARED_LIBRARIES) -LOCAL_STATIC_LIBRARIES := $(WEBKIT_STATIC_LIBRARIES) -LOCAL_CFLAGS := $(WEBKIT_CFLAGS) -# Include source files for JavaScriptCore -d := JavaScriptCore -LOCAL_PATH := $(BASE_PATH)/$d -LOCAL_MODULE_CLASS := STATIC_LIBRARIES -# Cannot use base_intermediates as this is a new module -intermediates := $(call local-intermediates-dir) -include $(LOCAL_PATH)/Android.mk -# Redefine LOCAL_SRC_FILES with the correct prefix -LOCAL_SRC_FILES := $(addprefix $d/,$(LOCAL_SRC_FILES)) -# Use the base path to resolve file names -LOCAL_PATH := $(BASE_PATH) -# Append jsc intermediate include paths to the WebKit include list. -LOCAL_C_INCLUDES := $(WEBKIT_C_INCLUDES) \ - $(intermediates) \ - $(intermediates)/parser \ - $(intermediates)/runtime \ -# Build libjs -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 libjs $(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 -- cgit v1.1