summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r54127 : Keep ours for Makefiles.Steve Block2010-02-041-63/+0
| | | | Change-Id: I120600c8aa2f52cb5b0c69181477863c61f87a11
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-0/+63
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* V8 can now use WebCore/bridge/jni/JNIBridge.cppSteve Block2010-01-271-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNIBridge.cpp is now used by both JSC and V8 This removes the last file from V8Bindings $ diff WebCore/bridge/jni/JNIBridge.cpp V8Binding/jni/jni_runtime.cpp 2d1 < * Copyright (C) 2003, 2004, 2005, 2007, 2009 Apple Inc. All rights reserved. 28c27 < #include "JNIBridge.h" --- > #include "jni_runtime.h" 30,32c29 < #if ENABLE(MAC_JAVA_BRIDGE) < < #include "CString.h" --- > #include "JNIUtility.h" 35,45d31 < < #ifdef NDEBUG < #define JS_LOG(formatAndArgs...) ((void)0) < #else < #define JS_LOG(formatAndArgs...) { \ < fprintf(stderr, "%s:%d -- %s: ", __FILE__, __LINE__, __FUNCTION__); \ < fprintf(stderr, formatAndArgs); \ < } < #endif < < using namespace JSC; 49d34 < 106,109d90 < #if USE(JSC) < ASSERT(JSLock::lockCount() > 0); < #endif < 127,130d107 < #if USE(JSC) < JSLock lock(SilenceAssertionsOnly); < #endif < 177,178d153 < < #endif // ENABLE(MAC_JAVA_BRIDGE) Change-Id: I3f0aabc5af56083aa950eca1609b2fe9b46726c9
* V8 can now use WebCore/bridge/jni/JNIBridge.hSteve Block2010-01-271-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JNIBridge.h is now used by both JSC and V8 $ diff WebCore/bridge/jni/JNIBridge.h V8Binding/jni/jni_runtime.h 2d1 < * Copyright (C) 2003, 2004, 2005, 2007, 2009, 2010 Apple Inc. All rights reserved. 27,30c26,27 < #ifndef JNIBridge_h < #define JNIBridge_h < < #if ENABLE(MAC_JAVA_BRIDGE) --- > #ifndef jni_runtime_h > #define jni_runtime_h 31a29 > #include "Bridge.h" 34,35c32,33 < #if USE(JSC) < #include "JavaStringJSC.h" --- > #if USE(V8) > #include "JavaStringV8.h" 64,66d61 < #if USE(JSC) < operator UString() const { return m_impl.uString(); } < #endif 118,120c113 < #endif // ENABLE(MAC_JAVA_BRIDGE) < < #endif // JNIBridge_h --- > #endif // jni_runtime_h Change-Id: I59c7dafb295aa7c81e79283333266c3f9f5a9a52
* Fix build byAndrei Popescu2010-01-251-10/+5
| | | | | - adding WebCore/svg to the include path. This should not be guarded by #if ENABLE(SVG) in the makefiles. - calling PluginView::getNPObject from PlatformBridge only when V8 is used.
* Move V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8 and fix styleSteve Block2010-01-211-1/+0
| | | | Change-Id: Icf99c709929ef14551de61e55780b97767575f01
* Move V8 jni_instance to bridge/jni/v8/JavaInstanceV8 and fix styleSteve Block2010-01-211-1/+0
| | | | | | | This is the V8 equivalent of http://trac.webkit.org/changeset/53412 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33951 Change-Id: Id22d59b7a5e0be72d594d454bb41c58760d824ff
* Move V8 jni_class to bridge/jni/v8/JavaClassV8 and fix styleSteve Block2010-01-201-1/+0
| | | | | | | This is the V8 equivalent of http://trac.webkit.org/changeset/53443 It is being upstreamed to webkit.org in https://bugs.webkit.org/show_bug.cgi?id=33898 Change-Id: I27dcf73cc7d8c0303243ea632361f2210819cbc4
* resolved conflicts for merge of a08c8a5f to masterSteve Block2010-01-141-89/+89
|\ | | | | | | Change-Id: I8efc2ef2e8e51d823b7ec8c26bd90ce934f60900
| * Move general includes before bindings includes.Steve Block2010-01-141-88/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids problems with collisions between WebCore/platform/text/StringBuilder.h and the new JavaScriptCore/runtime/StringBuilder.h. The latter is added in WebKit change 52075, so will be picked up in the next WebKit merge. We may also cherry-pick the changes which add this file as they are relevant to upstreaming in WebCore/bridge. In WebCore, we want '#include "StringBuilder.h"' to pick up the WebCore StringBuilder.h. However, when building WebCore for JSC, we need JavaScriptCore/runtime on the include path so that the JSC headers are picked up correctly. This change puts JavaScriptCore/runtime and other bindings includes after the WebCore and other general includes, so that the WebCore StringBuilder.h is picked up. This was upstreamed to webkit.org in http://trac.webkit.org/changeset/53254 Change-Id: I1b20b6d457f1d5d1f08764ff0b537058e0742835
* | Move STLPort to external/stlport.Steve Block2009-12-221-1/+1
| | | | | | | | Change-Id: I9cea43f9e1f98cefa654c5661dc7faa7f939068d
* | am fadf964d: am dc11ae82: Merge webkit.org at r51976 : Fix conflicts in ↵Steve Block2009-12-171-15/+0
|\ \ | |/ | | | | | | | | | | | | | | Makefiles. Merge commit 'fadf964da75468c2c995316cea8d82d32705a7e1' * commit 'fadf964da75468c2c995316cea8d82d32705a7e1': Merge webkit.org at r51976 : Fix conflicts in Makefiles.
| * Merge webkit.org at r51976 : Fix conflicts in Makefiles.Steve Block2009-12-171-15/+0
| | | | | | | | | | | | | | Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858 and http://trac.webkit.org/changeset/51926 Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
* | am b880d713: am 643ca787: Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-0/+15
|\ \ | |/ | | | | | | | | | | Merge commit 'b880d713c04257ca40abfef97c300afdead423b8' * commit 'b880d713c04257ca40abfef97c300afdead423b8': Merge webkit.org at r51976 : Initial merge by git.
| * Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-0/+15
| | | | | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* | am 2e3731e0: am 68bffef2: fix sim build: only issue -Wno-psabi if we ↵Mike Reed2009-12-101-3/+2
|\ \ | |/ | | | | | | | | | | | | | | building for arm Merge commit '2e3731e00eec43c6c5afe779b79a9b72f9cb906c' * commit '2e3731e00eec43c6c5afe779b79a9b72f9cb906c': fix sim build: only issue -Wno-psabi if we building for arm
| * fix sim build: only issue -Wno-psabi if we building for armMike Reed2009-12-101-3/+2
| |
* | am 62fa8660: am c1d0b386: remove 100s of warnings about va_list mangling in ↵Mike Reed2009-12-101-0/+3
|\ \ | |/ | | | | | | | | | | | | | | GCC 4.4 Merge commit '62fa8660c86eb823f9a46a9b05f62b0cc97bf558' * commit '62fa8660c86eb823f9a46a9b05f62b0cc97bf558': remove 100s of warnings about va_list mangling in GCC 4.4
| * remove 100s of warnings about va_list mangling in GCC 4.4Mike Reed2009-12-101-0/+3
| | | | | | | | | | | | | | | | On branch warning Changes to be committed: (use "git reset HEAD <file>..." to unstage) modified: Android.mk
* | am 8a6305a3: am bfe6eebb: Merge change I640d5ca9 into eclair-mr2Steve Block2009-12-101-3/+7
|\ \ | |/ | | | | | | | | | | Merge commit '8a6305a32ec9a1592ea82045a01b270319d996b7' * commit '8a6305a32ec9a1592ea82045a01b270319d996b7': Merges V8 version of jni_utility with JSC version at WebCore/bridge/jni.
| * Merges V8 version of jni_utility with JSC version at WebCore/bridge/jni.Steve Block2009-12-071-3/+7
| | | | | | | | Change-Id: I640d5ca9e38d78fd662550fa389cf8b463dc78b6
* | resolved conflicts for merge of 130cd407 to masterBen Murdoch2009-12-041-0/+1
|\ \ | |/ | | | | Change-Id: I472802c99be3510e346350f66a386643caba6410
| * Android History unforking pt4: Android specific changes to makefiles and ↵Ben Murdoch2009-12-031-0/+1
| | | | | | | | | | | | | | | | other code that has not been upstreamed yet (i.e. WebKit/android). This does NOT need to be upstreamed to WebKit (yet). Change-Id: I821fb90c3e463ef5fc4fa001ee5b8d967f9f7e48
* | Use STLPort instead of our stripped version.Patrick Scott2009-12-021-2/+5
| | | | | | | | | | | | | | This fixes the simulator build and allows us to get closer to sharing code with chromium. STLPort was copied with minor edits from the Android port of gears.
* | Revert "Don't use the WebKit STL when building the simulator"Jean-Baptiste Queru2009-12-011-5/+1
| | | | | | | | This reverts commit afa94bcc85b11e170818a896b14f38521d11d333.
* | Don't use the WebKit STL when building the simulatorJean-Baptiste Queru2009-12-011-1/+5
|/
* Removes superfluous use of LOCAL_SRC_FILES in derived Makefiles.Steve Block2009-11-241-1/+0
| | | | Change-Id: I685fd143279f92570a1844c847478e0cbe038e1e
* Fix the occassional build break.Patrick Scott2009-11-241-0/+5
| | | | | | | | WebCoreJniOnLoad.cpp now depends on some generated headers so it can occassional fail to build if make has many jobs. Add LOCAL_ADDITIONAL_DEPENDENCIES to prevent build breakage. This was pulled from the old perf/Android.mk file.
* Move the benchmark code inside libwebcore.soPatrick Scott2009-11-231-1/+1
| | | | | | | This adds about 8k of code to the library but it allows the benchmark to run without modifying the library. This makes it ideal when testing libwebcore.so since it is the exact same as our running library. It also makes it possible to always build the benchmark app.
* Move V8 Makefiles to from V8Binding directory to WebCore directory, to match ↵Steve Block2009-11-171-61/+23
| | | | | | | | JSC Makefiles. Also move binding include paths to Android.*bindings.mk and clean up some comments. Change-Id: I6d1475cdfcc330ec3e271cab1c3aa25a414f0448
* Factors out common code from JSC and V8 Makefiles, ready for upstreaming to ↵Steve Block2009-11-171-12/+337
| | | | | | | | | | | | | | | | | | | | | 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
* Fixes license headers for all Android-specific JavaScriptCore and WebCore ↵Steve Block2009-11-131-11/+19
| | | | | | | | | | | | | | | | | | | | | | files not yet upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. - For most files, I've fixed the names of copyright holders in the license text to 'THE COPYRIGHT HOLDERS' and cleaned up formatting in the existing BSD-style license. - For Makefiles and the following files in WebCore/platform/graphics/android/, I've changed from an Apache 2.0 license to the BSD-style license. - WebCore/platform/graphics/android/BitmapAllocatorAndroid.cpp - WebCore/platform/graphics/android/BitmapAllocatorAndroid.h - WebCore/platform/graphics/android/SharedBufferStream.cpp - WebCore/platform/graphics/android/SharedBufferStream.h - For the following files, I've changed from an LGPL licese to the BSD-style license. - WebCore/platform/graphics/android/FontPlatformData.h - WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp - WebCore/plugins/android/PluginDataAndroid.cpp Change-Id: Ic4c3e5610afc58637b7a9b81b1d0d1f17f4f4cb1
* Switch back to JSCAndrei Popescu2009-09-081-2/+2
|
* Turn on V8 by default.Feng Qian2009-07-211-2/+2
| | | | This change requires clean libwebcore, but I saw there are three clean libwebcore_intermediates steps in build/cleanspec.mk already. Do I need to add another one?
* Quick fix of makefileFeng Qian2009-07-151-3/+3
| | | | Command line start with # instead of //
* Use JS_ENGINE environment to control which JS engine to use.Feng Qian2009-07-151-4/+23
|
* Rename ENABLE_V8 to USE_ALT_JS_ENGINE.Feng Qian2009-07-131-1/+1
| | | | Prepare for the buildbot for both JS engines.
* Add V8 makefiles.Feng Qian2009-06-111-1/+1
| | | | Not exact match of JSC build because some Makefiles have to be splitted into two. I use Android.v8...mk.
* Restore old-style Makefiles.Feng Qian2009-06-111-257/+5
| | | | | | It is easier to work with merge tool. Will add a separate set of Makefiles for V8. Add Android.v8.mk as a reference.
* Fix the prelink variable.Patrick Scott2009-05-201-3/+2
|
* Move Browser test plugin from webkit project to development project.Grace Kloba2009-05-141-3/+1
| | | | Change how we set plugin path as we can support more than one path now.
* Remove uncommented makefile conditional. Fix an assert condition.Patrick Scott2009-05-131-2/+0
|
* Shave ~60k off of libwebcore.so and make webcore_test always build.Patrick Scott2009-05-121-6/+31
| | | | | | | | | | | | | | | Build libwebcore as a static library first. Then build it as a shared library using the jni entry point as the single source file. This strips uneeded code out of the final library. Have webcore_test link against the static library so that the symbols are all visible. Update webcore_test to link against the new webkit drop as well. Rearrange the main makefile to create WEBKIT_* variables that a sub-makefile like webcore_test can use to define includes, cflags, and libraries. Manually add a dependency on the generated webkit source files. Verified that svg and v8 work as well as the simulator.
* Fix SVG build with V8.Feng Qian2009-05-061-0/+5
| | | | | | Because some SVG anomation source files depend on generic sort functions, we cannot compile them. Add as ENABLE_SVG_ANIMATION build flag to disable SVG Animation.
* add additional svg support and complianceCary Clark2009-05-011-0/+2
| | | | | | | | turn on SVG_FONTS, SVG_AS_IMAGE, SVG_FILTERS, SVG_FOREIGN_OBJECT, SVG_USE getWebCore may return null for SVG ScrollView add FontPlatformData.size() add more stl sort interfaces
* Merges p9 CLs 144856 and 145055 to GIT to enable the Database API in the ↵Ben Murdoch2009-04-301-0/+1
| | | | browser.
* Merge commit 'goog/master-v8droid' into HEADFeng Qian2009-04-291-26/+46
|\ | | | | | | | | | | | | The CL imports V8 source from trunk, and V8 binding code from Chromium, and small changes from future WebKit revision. To enable V8, add ENABLE_V8 := true in buildspec.mk.
| * Chagne JS_ENGINE to ENABLE_V8.Feng Qian2009-04-291-17/+14
| | | | | | | | | | To enable V8, set ENABLE_V8 := true in the buildspec.mk in the home directory. Also fixed one SVG build issue in JSC build case.
| * Build V8 as a static library.Feng Qian2009-04-241-6/+13
| | | | | | | | To switch between jsc and v8, one needs to edit webkit/Android.mk to change the value of JS_ENGINE, make sure no white space after 'jsc' or 'v8'.
| * Small fix of JSC binding makefiles.Feng Qian2009-04-221-2/+2
| |
generated by cgit v1.1 at 2024-11-03 22:55:59 +0000