summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge webkit.org at r51976 : Fix conflicts in Makefiles.Steve Block2009-12-171-3/+0
| | | | | | | Android Makefiles were upstreamed in http://trac.webkit.org/changeset/51858 and http://trac.webkit.org/changeset/51926 Change-Id: I00f30d4894c1c5064fb7bd9be27317c039dbb0ad
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-0/+4
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Factors out common code from JSC and V8 Makefiles, ready for upstreaming to ↵Steve Block2009-11-171-34/+2
| | | | | | | | | | | | | | | | | | | | | 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
* Fix spurious build breaks.Patrick Scott2009-10-201-3/+1
| | | | Split libwebcore.a into libwebcore.a and libjs.a and then link them together.
* Merge webkit.org at R49305 : Add Android makefiles and set ENABLE flags.Steve Block2009-10-201-0/+2
| | | | | | | We disable INSPECTOR - See http://trac.webkit.org/changeset/48430 We disable EVENT_SOURCE - see http://trac.webkit.org/changeset/47323 Change-Id: Iab25b3bb56582d9df1e693ed7158338e953677b7
* Remove ARMAssembler.cpp from WebKit build, as it is not required on Android.Steve Block2009-10-191-1/+0
| | | | Change-Id: Ic5a299518e5ca51b6833e4c236b97c7ea7dbe4a7
* Switch back to JSCAndrei Popescu2009-09-081-1/+0
|
* fix JSC support.Andrei Popescu2009-08-191-3/+1
|
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-1/+0
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Revert "Start fixing JSC compile errors for new webkit."Andrei Popescu2009-08-191-1/+3
| | | | This reverts commit 62983d46fda85f4d912c221e5cbc91a05d4edebf.
* Start fixing JSC compile errors for new webkit.Ben Murdoch2009-08-191-3/+1
|
* Merge WebKit r47420Ben Murdoch2009-08-181-0/+1
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-0/+9
|
* Makefile and webkitmerge tool edits needed to merge with latest webkit.Ben Murdoch2009-08-111-2/+2
|
* merge from open-source masterJean-Baptiste Queru2009-08-061-1/+1
|\
| * Remove chartables.c as it's already included indirectlyJean-Baptiste Queru2009-08-051-1/+1
| |
* | Get WebKit r44544.Feng Qian2009-06-171-1/+4
| |
* | Restore old-style Makefiles.Feng Qian2009-06-111-1/+37
| | | | | | | | | | | | It is easier to work with merge tool. Will add a separate set of Makefiles for V8. Add Android.v8.mk as a reference.
* | Move WTF files into Android.wtf.mkFeng Qian2009-04-211-37/+1
| | | | | | | | This file can be shared by both JavaScriptCore and V8 builds.
* | AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-0/+6
| | | | | | | | Automated import of CL 145796
* | AI 144643: a few more fixes for the automated merge toolCary Clark2009-04-061-0/+1
| | | | | | | | | | | | | | | | don't include chromium files in JavaScriptCore add a list of generated files to exclude BUG=1553405 Automated import of CL 144643
* | AI 143486: Update diff tool rules in webkit makefiles.Cary Clark2009-03-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Anticipating another merge with webkit, these changes update the rules to automatically exclude files we've already removed manually. A new rule allows including files that are not yet checked into webkit's makefiles (e.g., Touch). The exclude rules no longer need to be alphabetized, but the makefile sources still do -- so fix a couple of entries that are out of order. BUG=1553405 Automated import of CL 143486
* | Automated import from //branches/master/...@142546,142546Cary Clark2009-03-251-11/+12
|/
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-41/+51
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+214
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-214/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-131/+125
|
* Initial ContributionThe Android Open Source Project2008-10-211-0/+220
generated by cgit v1.1 at 2024-11-16 17:14:17 +0000