Doug Turner
9d4fd110ef
backing out the backout of the landing of the patrick patch queue. lets try this again in the morning with fresh eyes and fresh coffee
2011-11-07 23:54:21 -08:00
Doug Turner
557fa00813
Removing use strict from a hosed merge
2011-11-07 20:54:50 -08:00
Patrick Walton
b97a946207
Back out birch-pan-zoom patch queue due to crashes on mochitests. no bug, r=mfinkle
2011-11-07 17:04:44 -08:00
Patrick Walton
bde2ae2410
* * *
...
try: -b do -p linux-android -u none -t none
2011-11-07 14:15:58 -08:00
Doug Turner
4a3bc4cd6c
Merge
2011-11-04 10:46:58 -07:00
Jim Mathies
9bc8f916ad
Bug 577867 - Add CityHash NSIS extension to build. r=rstrong
2011-11-03 09:39:50 -05:00
Jim Mathies
7a42272afb
Bug 577867 - Add CityHash NSIS extension Visual Studio project to other-licenses repo. r=rstrong, r=gerv
2011-11-03 09:39:50 -05:00
Doug Turner
c1298234ab
Bug 696315 - Remove Quit menu option. r=bnicholson@mozilla.com
...
--HG--
extra : rebase_source : 27492a24f3c58e71d9df98534612c0f74c05d7e4
2011-11-02 22:32:36 -07:00
Mounir Lamouri
81e95dc4d5
Bug 696038 - (2/3) Boilerplate code to communicate between hal and Android Java code. r=cjones
2011-11-02 16:35:11 +01:00
Brad Lassey
325ef462b9
no bug - make quit work r=dougt
...
--HG--
extra : rebase_source : 167f35f6ac7543d3954e8f7c0d641d6e70414ce9
2011-10-19 16:31:31 -04:00
Kartikaya Gupta
32f767413d
Bug 695170 - Implement visited link styles [r=blassey]
...
Provide an IHistory interface implementation from the android widgets
rather than using the one in Places. This allows the Link class to get
history information from the android code. The IHistory implementation
talks to the Android browser history database via JNI.
The Java-side implementation attempts to batch-process the requests coming
in, and keeps an in-memory cache of the visited links to avoid multiple
hits to the database. The in-memory cache is guaranteed to be cleared
by the VM before an OOMs get thrown.
The current implementation does not consider external events that might
update the history database, and so the visited link information
provided to Gecko might not reflect the latest information in the
Android browser history database.
2011-10-25 11:39:32 -04:00
Doug Turner
2084bc10db
Backing out the Quit change which is causing bug 696386. r=mfinkle
2011-10-23 21:19:42 -07:00
Brad Lassey
8f858b54f3
no bug - make quit work r=dougt
2011-10-19 16:31:31 -04:00
Doug Turner
7093994409
Merge from mozilla-central
2011-10-14 10:22:33 -07:00
Ed Morley
d959511237
Merge last green changeset of mozilla-inbound to mozilla-central
2011-10-14 10:58:43 +01:00
Jeff Hammel
ecd567d8cd
Bug 676078 Remove unused mozmill code from mozilla-central r=ctalbert
...
--HG--
rename : testing/mozmill/simplejson-2.1.1/CHANGES.txt => other-licenses/simplejson-2.1.1/CHANGES.txt
rename : testing/mozmill/simplejson-2.1.1/LICENSE.txt => other-licenses/simplejson-2.1.1/LICENSE.txt
rename : testing/mozmill/simplejson-2.1.1/PKG-INFO => other-licenses/simplejson-2.1.1/PKG-INFO
rename : testing/mozmill/simplejson-2.1.1/conf.py => other-licenses/simplejson-2.1.1/conf.py
rename : testing/mozmill/simplejson-2.1.1/docs/_sources/index.txt => other-licenses/simplejson-2.1.1/docs/_sources/index.txt
rename : testing/mozmill/simplejson-2.1.1/docs/_static/contents.png => other-licenses/simplejson-2.1.1/docs/_static/contents.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/default.css => other-licenses/simplejson-2.1.1/docs/_static/default.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/doctools.js => other-licenses/simplejson-2.1.1/docs/_static/doctools.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/file.png => other-licenses/simplejson-2.1.1/docs/_static/file.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/interface.js => other-licenses/simplejson-2.1.1/docs/_static/interface.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/jquery.js => other-licenses/simplejson-2.1.1/docs/_static/jquery.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/minus.png => other-licenses/simplejson-2.1.1/docs/_static/minus.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/navigation.png => other-licenses/simplejson-2.1.1/docs/_static/navigation.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/plus.png => other-licenses/simplejson-2.1.1/docs/_static/plus.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/pygments.css => other-licenses/simplejson-2.1.1/docs/_static/pygments.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/rightsidebar.css => other-licenses/simplejson-2.1.1/docs/_static/rightsidebar.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/searchtools.js => other-licenses/simplejson-2.1.1/docs/_static/searchtools.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/sphinxdoc.css => other-licenses/simplejson-2.1.1/docs/_static/sphinxdoc.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/stickysidebar.css => other-licenses/simplejson-2.1.1/docs/_static/stickysidebar.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/traditional.css => other-licenses/simplejson-2.1.1/docs/_static/traditional.css
rename : testing/mozmill/simplejson-2.1.1/docs/genindex.html => other-licenses/simplejson-2.1.1/docs/genindex.html
rename : testing/mozmill/simplejson-2.1.1/docs/index.html => other-licenses/simplejson-2.1.1/docs/index.html
rename : testing/mozmill/simplejson-2.1.1/docs/objects.inv => other-licenses/simplejson-2.1.1/docs/objects.inv
rename : testing/mozmill/simplejson-2.1.1/docs/search.html => other-licenses/simplejson-2.1.1/docs/search.html
rename : testing/mozmill/simplejson-2.1.1/docs/searchindex.js => other-licenses/simplejson-2.1.1/docs/searchindex.js
rename : testing/mozmill/simplejson-2.1.1/docs/searchindex.json => other-licenses/simplejson-2.1.1/docs/searchindex.json
rename : testing/mozmill/simplejson-2.1.1/ez_setup.py => other-licenses/simplejson-2.1.1/ez_setup.py
rename : testing/mozmill/simplejson-2.1.1/index.rst => other-licenses/simplejson-2.1.1/index.rst
rename : testing/mozmill/simplejson-2.1.1/scripts/make_docs.py => other-licenses/simplejson-2.1.1/scripts/make_docs.py
rename : testing/mozmill/simplejson-2.1.1/setup.cfg => other-licenses/simplejson-2.1.1/setup.cfg
rename : testing/mozmill/simplejson-2.1.1/setup.py => other-licenses/simplejson-2.1.1/setup.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/__init__.py => other-licenses/simplejson-2.1.1/simplejson/__init__.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/_speedups.c => other-licenses/simplejson-2.1.1/simplejson/_speedups.c
rename : testing/mozmill/simplejson-2.1.1/simplejson/decoder.py => other-licenses/simplejson-2.1.1/simplejson/decoder.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/encoder.py => other-licenses/simplejson-2.1.1/simplejson/encoder.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/ordered_dict.py => other-licenses/simplejson-2.1.1/simplejson/ordered_dict.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/scanner.py => other-licenses/simplejson-2.1.1/simplejson/scanner.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/__init__.py => other-licenses/simplejson-2.1.1/simplejson/tests/__init__.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_check_circular.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_check_circular.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_decimal.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_decimal.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_decode.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_decode.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_default.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_default.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_dump.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_dump.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_encode_basestring_ascii.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_encode_basestring_ascii.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_encode_for_html.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_encode_for_html.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_fail.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_fail.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_float.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_float.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_indent.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_indent.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass1.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass1.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass2.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass2.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass3.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass3.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_recursion.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_recursion.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_scanstring.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_scanstring.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_separators.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_separators.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_speedups.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_speedups.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_unicode.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_unicode.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tool.py => other-licenses/simplejson-2.1.1/simplejson/tool.py
rename : testing/mozmill/virtualenv/MANIFEST.in => other-licenses/virtualenv/MANIFEST.in
rename : testing/mozmill/virtualenv/PKG-INFO => other-licenses/virtualenv/PKG-INFO
rename : testing/mozmill/virtualenv/docs/_build/_sources/index.txt => other-licenses/virtualenv/docs/_build/_sources/index.txt
rename : testing/mozmill/virtualenv/docs/_build/_sources/license.txt => other-licenses/virtualenv/docs/_build/_sources/license.txt
rename : testing/mozmill/virtualenv/docs/_build/_sources/news.txt => other-licenses/virtualenv/docs/_build/_sources/news.txt
rename : testing/mozmill/virtualenv/docs/index.txt => other-licenses/virtualenv/docs/index.txt
rename : testing/mozmill/virtualenv/docs/license.txt => other-licenses/virtualenv/docs/license.txt
rename : testing/mozmill/virtualenv/docs/news.txt => other-licenses/virtualenv/docs/news.txt
rename : testing/mozmill/virtualenv/scripts/virtualenv => other-licenses/virtualenv/scripts/virtualenv
rename : testing/mozmill/virtualenv/setup.cfg => other-licenses/virtualenv/setup.cfg
rename : testing/mozmill/virtualenv/setup.py => other-licenses/virtualenv/setup.py
rename : testing/mozmill/virtualenv/virtualenv.py => other-licenses/virtualenv/virtualenv.py
rename : testing/mozmill/virtualenv/virtualenv_support/__init__.py => other-licenses/virtualenv/virtualenv_support/__init__.py
rename : testing/mozmill/virtualenv/virtualenv_support/distribute-0.6.8.tar.gz => other-licenses/virtualenv/virtualenv_support/distribute-0.6.8.tar.gz
rename : testing/mozmill/virtualenv/virtualenv_support/pip-0.7.1.tar.gz => other-licenses/virtualenv/virtualenv_support/pip-0.7.1.tar.gz
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg
2011-10-13 16:27:33 -07:00
Doug Turner
f7ffea8082
Patch from https://github.com/snorp/mozilla-central faster branch.
2011-10-10 17:40:17 -07:00
Brad Lassey
5cf7a49da2
Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367
2011-10-10 10:40:27 -04:00
Matt Brubeck
d53193f383
Back out f7bf7ac18a79 (bug 684826), 3a910924c50c (bug 687367), and 524a6bb8744b (bug 693086) because of Android bustage on a CLOSED TREE
2011-10-10 09:43:58 -07:00
Brad Lassey
ab723a6a51
merge
2011-10-10 10:40:57 -04:00
Brad Lassey
4528a38462
Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367
2011-10-10 10:40:27 -04:00
Michael Edwards
8d268b37aa
Bug 687367 - Make bionic domain name functions thread-safe on pre-3.0 Android, r=dougt
2011-10-06 20:55:50 -07:00
Matt Brubeck
d6af4c95e2
Bug 691054 - Back out bug 667980 (getNetworkLinkType) on Android because of scary permissions [r=dougt]
2011-10-03 16:34:43 -07:00
Brad Lassey
d174ebedad
Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367
2011-10-10 10:40:27 -04:00
Matt Brubeck
eb9465f1a3
Back out f7bf7ac18a79 (bug 684826), 3a910924c50c (bug 687367), and 524a6bb8744b (bug 693086) because of Android bustage on a CLOSED TREE
2011-10-10 09:47:27 -07:00
Mike Hommey
6ed3ac0c23
Bug 690856 - Ensure Instruction and Data cache coherency after extracting libraries from the DEBUG intent r=mwu
2011-09-30 20:42:24 +02:00
Matt Brubeck
6abf5a179d
Merge last green changeset of mozilla-inbound to mozilla-central
2011-10-07 12:06:20 -07:00
Mike Hommey
43ad082aeb
Bug 687446 - Allow debug symbols to be found under gdb without extracted libraries. r=mwu
2011-10-07 08:31:29 +02:00
Mike Hommey
253dcacb30
Bug 692381 - Remove one of the Android library extraction code paths. r=mwu
2011-10-07 08:30:32 +02:00
Makoto Kato
760958734d
Bug 681202 - Add Android x86 target. r=glandium
2011-09-29 13:39:03 +09:00
Fabrice Desré
710899e3ab
Bug 659188 - Android and media parts [r=blassey] [r=cpearce]
2011-09-26 17:25:41 -07:00
Mike Hommey
af8e7baa1b
Bug 687147 - Ensure Instruction and Data cache coherency after extracting libraries. r=mwu
2011-09-23 14:31:11 +02:00
Mike Hommey
e9f9b017a8
Bug 686876 - Move libraries at the top level in the apk. r=mfinkle
2011-09-21 18:06:14 +02:00
Jim Chen
c1be77aca6
Bug 687147 - Workaround linker crash when calling .init_array in libmozalloc.so; r=
...
Bug 687147 - Workaround linker crash when calling .init_array in libmozalloc.so; r=mfinkle r=glandium
2011-09-20 11:16:00 -04:00
Doug Turner
fa4f75d7e3
Bug 630007 - Minimal support NPAPI on ANDROID. Pre-Honeycomb inproccess support only. r=josh.
2011-09-16 14:34:31 -07:00
Ed Morley
00e6fcf8b2
Backout d4bdab069bbc (bug 630007) for qt build bustage and various oranges on other platforms
2011-09-17 00:27:55 +01:00
Doug Turner
0ef3efa1a5
Bug 630007 - Minimal support NPAPI on ANDROID. Pre-Honeycomb inproccess support only. r=josh.
2011-09-16 14:34:31 -07:00
Kyle Huey
614dad33a3
Merge m-c to b-s.
2011-09-07 10:47:50 -04:00
Mike Hommey
43f0a42c79
Bug 684213 - Directly uncompress libraries into the mmap()ed cache files. r=mwu
2011-09-07 07:56:28 +02:00
Mike Hommey
d0a3d1bc2f
Backout the backout of e5815c156b6c (bug 683096), 9ca928d8095c (merge), a286edb8ca4b (bug 683875), 61dc35b8f63f (bug 683171), b0741ae44def (bug 683875), 8e01bc314326 + e2697c06468f (bug 677501), 805e28e85577 (bug 680440)
2011-09-03 08:19:06 +02:00
Ed Morley
ed260633c7
Backout e5815c156b6c (bug 683096), 9ca928d8095c (merge), a286edb8ca4b (bug 683875), 61dc35b8f63f (bug 683171), b0741ae44def (bug 683875), 8e01bc314326 + e2697c06468f (bug 677501), 805e28e85577 (bug 680440) for Win opt orange and purple galore, on a CLOSED TREE
2011-09-03 04:35:21 +01:00
Kyle Huey
2fe1065da6
Merge b-s to m-c.
2011-09-02 17:35:11 -04:00
Mike Hommey
cfd3ac70a2
Bug 677501 - Build a mozutils library containing jemalloc and other things. r=khuey
...
--HG--
rename : memory/jemalloc/Makefile.in => memory/mozutils/Makefile.in
rename : memory/jemalloc/fixcrt.py => memory/mozutils/fixcrt.py
rename : memory/jemalloc/jemalloc.def => memory/mozutils/mozutils.def.in
2011-09-01 14:12:10 +02:00
Mike Hommey
1fbab12774
Bug 680440 - Clean up jemalloc linkage. r=khuey
2011-09-01 14:11:56 +02:00
Kyle Huey
7b7b45a351
Merge m-c to b-s.
2011-08-31 07:52:43 -04:00
Jim Chen
7bcf05e723
Bug 674806 - d. Use char* for pointer arithmetic [r=mwu]
2011-08-30 17:11:37 -07:00
Ed Morley
19a1226d22
Merge last green changeset on m-i to m-c
2011-09-01 08:41:18 +01:00
Atul Aggarwal
31dcf08260
Bug 679612 - Add fclose calls to every exit point in APKOpen.cpp to prevent resource leaks; r=mwu
2011-08-31 16:30:33 +01:00
Kyle Huey
0e655f0dc8
Merge m-c to b-s.
2011-08-24 08:34:27 -04:00
Mike Hommey
35dde42be0
Bug 680373 - Link jemalloc into mozutils instead of mozalloc on Android. r=blassey,r=pbiggar
2011-08-24 12:55:13 +02:00