diff options
| author | Steve Block <steveblock@google.com> | 2009-11-13 20:36:38 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-17 12:06:09 +0000 |
| commit | 2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1 (patch) | |
| tree | c5ef1c7faa2b0c58e7ad9611c36d42d88fa780c0 /JavaScriptCore | |
| parent | 3545b177817f5f82c51ac218adf40b7d4baa9753 (diff) | |
| download | external_webkit-2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1.zip external_webkit-2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1.tar.gz external_webkit-2a35006024d3c1a6cb14cfc5dd0d6ba487f4b3a1.tar.bz2 | |
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
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/Android.mk | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/JavaScriptCore/Android.mk b/JavaScriptCore/Android.mk index 6bab02d..ba7f05a 100644 --- a/JavaScriptCore/Android.mk +++ b/JavaScriptCore/Android.mk @@ -1,5 +1,5 @@ ## -## Copyright 2007, The Android Open Source Project +## Copyright 2009, The Android Open Source Project ## ## Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions @@ -23,40 +23,8 @@ ## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ## -#LOCAL_CFLAGS += -E -v - -# 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 := \ -# AllInOneFile.cpp \ -# jsc.cpp \ -# parser/Grammar.y \ -# pcre/ucptable.cpp \ -# wtf/GOwnPtr.cpp \ -# wtf/*Gtk.cpp \ -# wtf/*Qt.cpp \ -# wtf/*Win.cpp \ - -# This comment block is read by tools/webkitsync/diff.cpp -# Don't remove it or move it. -# -# The following directory wildcard matches are intentionally not included -# If an entry starts with '/', any subdirectory may match -# If an entry starts with '^', the first directory must match -# LOCAL_DIR_WILDCARD_EXCLUDED := \ -# ^API/* \ -# /chromium/* \ -# /gtk/* \ -# ^jit/* \ -# /mac/* \ -# /qt/* \ -# /win/* \ -# /wx/* \ - LOCAL_SRC_FILES := \ - API/JSValueRef.cpp \ + API/JSValueRef.cpp \ API/JSCallbackObject.cpp \ API/OpaqueJSString.cpp \ \ |