Commit Graph

216176 Commits

Author SHA1 Message Date
Nick Alexander
562d592bff Bug 1099345 - Use pattern rule to generate multiple outputs in widget/android/bindings. r=gps
This works around a race condition observed with GENERATED_SOURCES.  A
global solution might be to make GENERATED_SOURCES part of the
'export' tier; this is a smaller fix.

--HG--
rename : widget/android/bindings/mediacodec-classes.txt => widget/android/bindings/MediaCodec-classes.txt
rename : widget/android/bindings/surfacetexture-classes.txt => widget/android/bindings/SurfaceTexture-classes.txt
extra : rebase_source : 073dadd8c1b48ea32f975b2232c2bdeafe315ab4
2014-11-19 11:33:05 -08:00
Nick Alexander
f16d77b0a2 Bug 1099501 - Export and use ANDROID_TOOLS where appropriate. r=snorp,bnicholson
In certain configurations, in particular when installing the Android SDK
using HomeBrew, one sees a configuration with symlinks like:

    [brian@brian-macbook git]$ ls -l /usr/local/Cellar/android-sdk/23.0.2/
    total 72
    ...
    lrwxr-xr-x   1 brian  admin    38 Nov 14 16:39 platforms -> ../../../var/lib/android-sdk/platforms
    ...
    drwxr-xr-x  26 brian  admin   884 Nov 14 17:43 tools

In this case, we have
ANDROID_SDK=/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21.

It is an anti-pattern to use ANDORID_SDK/.. to find other paths in the
tree.  This pattern is used in at least two places:

1) When we try to find
/usr/local/Cellar/android-sdk/23.0.2/platforms/android-21/../../tools,
we end up in the /usr/local/var/lib subtree.  This patch works around
that by exporting and using ANDROID_TOOLS; ANDROID_TOOLS itself is
extracted using path matching, rather than following .. through the
filesystem.

2) We also need to use ANDROID_SDK_ROOT rather than
ANDROID_SDK/../.. through-out.

--HG--
extra : rebase_source : 5e0323a94f2b80550f17a624e16f338cdeec406d
2014-11-17 11:12:00 -08:00
Mike Conley
df420b6488 Bug 1008435 - Let the Gecko Profiler work with child processes. r=BenWa,smaug.
We now allow profiling the content process for e10s, and plugin processes.

--HG--
extra : rebase_source : 1f2e35d4d55b33b56160132893dbf7d4787925fa
extra : amend_source : d03465d4318f8e50c7624ad0eeb681b30c068b11
2014-11-18 12:50:25 -05:00
Jared Wein
cae77eaed3 Bug 1101006 - Refactor mozLoop.{get, set}LoopCharPref and mozLoop.{get, set}LoopBoolPref to mozLoop.{get, set}Pref that uses getPrefType. r=mikedeboer 2014-11-19 13:29:27 -05:00
Jared Wein
7009fd055f Bug 1074932 - Desktop client user can access product tour from gears menu. r=MattN 2014-11-19 13:29:17 -05:00
Carsten "Tomcat" Book
02addf9eca Backed out changeset 5b80055fba93 (bug 949104) for Android 4.0 Debug Test failures 2014-11-19 17:08:09 +01:00
Nicolas Perriault
fc8903218e Bug 1094137 - Create a common shared store creator for Loop. r=Standard8 2014-11-19 14:59:08 +00:00
Mark Finkle
9abc4b2742 Bug 949104 - Don't write history visits during HTTP redirection r=rnewman 2014-11-19 09:06:16 -05:00
J. Ryan Stinnett
a8549435f3 Bug 1097833 - Move local runtime behind a pref again. r=paul 2014-11-19 07:41:42 -06:00
Carsten "Tomcat" Book
4e851e844c Merge mozilla-central to fx-team 2014-11-19 13:52:17 +01:00
Carsten "Tomcat" Book
bfb6af9e21 merge fx-team to mozilla-central a=merge 2014-11-19 13:43:59 +01:00
Carsten "Tomcat" Book
806548ea6d merge mozilla-inbound to mozilla-central a=merge 2014-11-19 13:35:26 +01:00
Carsten "Tomcat" Book
26dee6c57f merge b2g-inbound to mozilla-central a=merge 2014-11-19 13:00:57 +01:00
Patrick Brosset
fbca21254c Bug 1076866 - Rect highlighter; r=bgrins 2014-11-19 11:16:25 +01:00
Mark Banner
c0b00d4b87 Follow-up to bug 1099128 - temporarily turn off rooms for mochitests to fix bc1 test failures. rs+a=bustage-fix 2014-11-19 09:55:34 +00:00
Mark Banner
ea3628a53a Bug 1099128 Swap Loop to use 2 person conversations (aka 'rooms') rather than call urls. r=mikedeboer,a=enabling-for-dogfooding,a=Tomcat 2014-11-19 08:10:56 +00:00
B2G Bumper Bot
703bd74f22 Bumping manifests a=b2g-bump 2014-11-18 22:48:28 -08:00
Wes Kocher
49ad7fd209 Merge inbound to m-c a=merge 2014-11-18 18:07:51 -08:00
Wes Kocher
5d1faf6946 Merge fx-team to m-c a=merge 2014-11-18 17:01:18 -08:00
Mason Chang
a88f78597a bug 552020 Part 3: Enable Creation of mozilla::TimeStamp from system timestamps. r=roc 2014-11-18 13:28:42 -08:00
Mason Chang
e356eb5ca2 Bug 552020. Part 2. Enable Vsync Profiler Markers across platforms. r=benwa 2014-11-18 13:28:42 -08:00
Mason Chang
a549f6a91c bug 552020 Part 1: Hook into CVDisplayLink to get vsync events on OSX. r=benwa,mstange 2014-11-18 13:28:42 -08:00
Wes Kocher
e0eaae4570 Backed out changeset c7a24854801e (bug 1093567) for crashtest orange 2014-11-18 13:12:00 -08:00
Richard Newman
83ad36ec3e Bug 1100750 - Handle developer usernames that contain dashes. r=nalexander 2014-11-18 10:38:18 -08:00
Dave Townsend
ae00600892 Bug 1093594: Fix browser_alltabslistener.js to work in e10s. r=gijs 2014-11-18 09:53:43 -08:00
B2G Bumper Bot
ce0e8fcb3a Bumping manifests a=b2g-bump 2014-11-18 08:48:55 -08:00
B2G Bumper Bot
335dc476fb Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4f3818d9c557
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26229 from davehunt/bug1074117-email

Bug 1074117 - Use expected conditions and optimise element lookups in email app object

========

https://hg.mozilla.org/integration/gaia-central/rev/5b190267fce7
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1074117 - Use expected conditions where appropriate and optimise element lookups in email app object. r=fstrugariu
2014-11-18 08:48:39 -08:00
Carsten "Tomcat" Book
e3a2372f3e Merge mozilla-central to b2g-inbound 2014-11-18 17:37:40 +01:00
Carsten "Tomcat" Book
a156113b50 merge mozilla-inbound to mozilla-central a=merge 2014-11-18 17:25:29 +01:00
B2G Bumper Bot
4335118665 Bumping manifests a=b2g-bump 2014-11-18 08:17:06 -08:00
B2G Bumper Bot
05f70586f4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f8dddaa0881b
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26233 from davehunt/bug1074117-ftu

Bug 1074117 - Use expected conditions and optimise element lookups in first time use app object

========

https://hg.mozilla.org/integration/gaia-central/rev/481900875671
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1074117 - Use expected conditions where appropriate and optimise element lookups in first time use app object. r=fstrugariu
2014-11-18 08:06:56 -08:00
B2G Bumper Bot
602e136de3 Bumping manifests a=b2g-bump 2014-11-18 08:02:01 -08:00
B2G Bumper Bot
62affb19c4 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4f0c57bbc162
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26143 from viorelaioia/bug_1098300

Bug 1098300 - [v2.2] Investigate test_dialer_miss_call_from_known_contac...

========

https://hg.mozilla.org/integration/gaia-central/rev/43f27526f473
Author: Viorela Ioia <viorelaioia@gmail.com>
Desc: Bug 1098300 - [v2.2] Investigate test_dialer_miss_call_from_known_contact_notification.py intermittent failure
2014-11-18 07:51:56 -08:00
B2G Bumper Bot
76d7b7db57 Bumping manifests a=b2g-bump 2014-11-18 07:41:57 -08:00
B2G Bumper Bot
2ab7aab7d8 Bumping gaia.json for 6 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/47df091dc969
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26235 from chirarobert/bug_1091676

Bug 1091676 - Investigate intermittent failure in test_cost_control_rese...

========

https://hg.mozilla.org/integration/gaia-central/rev/614add3cd87c
Author: Robert Chira <robertchira@P5075.(none)>
Desc: Bug 1091676 - Investigate intermittent failure in test_cost_control_reset_wifi.py

========

https://hg.mozilla.org/integration/gaia-central/rev/3ee7f8d8e031
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26226 from davehunt/bug1074117-costcontrol

Bug 1074117 - Use expected conditions and optimise element lookups in cost control app object

========

https://hg.mozilla.org/integration/gaia-central/rev/3bf52b83f5cb
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1074117 - Use expected conditions where appropriate and optimise element lookups in cost control app object. r=fstrugariu

========

https://hg.mozilla.org/integration/gaia-central/rev/60b5b7c5618a
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26232 from davehunt/bug1074117-fmradio

Bug 1074117 - Use expected conditions and optimise element lookups in fm radio app object

========

https://hg.mozilla.org/integration/gaia-central/rev/c429536af5da
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1074117 - Use expected conditions where appropriate and optimise element lookups in fm radio app object. r=fstrugariu
2014-11-18 07:36:54 -08:00
B2G Bumper Bot
da49663d87 Bumping manifests a=b2g-bump 2014-11-18 07:27:00 -08:00
B2G Bumper Bot
74ab3293a6 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1703f9702f92
Author: Florin Strugariu <florin.strugariu@softvision.ro>
Desc: Merge pull request #26230 from davehunt/bug1074117-emergencycall

Bug 1074117 - Use expected conditions and optimise element lookups in emergency call app object

========

https://hg.mozilla.org/integration/gaia-central/rev/0a29876b04ab
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 1074117 - Use expected conditions where appropriate and optimise element lookups in emergency call app object. r=fstrugariu
2014-11-18 07:21:56 -08:00
B2G Bumper Bot
42ec0b6844 Bumping manifests a=b2g-bump 2014-11-18 06:41:56 -08:00
B2G Bumper Bot
3c95d78ddc Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/902924966a64
Author: viorelaioia <viorela.ioia@softvision.ro>
Desc: Merge pull request #26236 from chirarobert/bug_1100846

Bug 1100846 - [v2.2] Investigate test_sms_with_attachments intermittent ...

========

https://hg.mozilla.org/integration/gaia-central/rev/92cff4cbf9bc
Author: Robert Chira <robertchira@P5075.(none)>
Desc: Bug 1100846 - [v2.2] Investigate test_sms_with_attachments intermittent failure
2014-11-18 06:36:54 -08:00
B2G Bumper Bot
b3b191dfbb Bumping manifests a=b2g-bump 2014-11-18 06:11:56 -08:00
B2G Bumper Bot
b5cf6562bf Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/d82366dc54a0
Author: Fernando Jiménez Moreno <ferjmoreno@gmail.com>
Desc: Merge pull request #26068 from ferjm/bug1092394.contactdetails

Bug 1092394 - [Contacts] Accessing the contact details from the call log...

========

https://hg.mozilla.org/integration/gaia-central/rev/df52b8b35d03
Author: ferjm <ferjmoreno@gmail.com>
Desc: Bug 1092394 - [Contacts] Accessing the contact details from the call log Call information, the User lands briefly in Import Contacts before transitioning to the contact details screen. r=jmcantera
2014-11-18 06:06:53 -08:00
B2G Bumper Bot
28019facf9 Bumping manifests a=b2g-bump 2014-11-18 05:41:55 -08:00
B2G Bumper Bot
404f3624c7 Bumping gaia.json for 3 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/b65b2ed7349b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Revert "Bug 1096704 - Prevent rocketbar trigger during an edge gesture."

This reverts commit b3a404bd3d9e40ff4ca8c42bca47a999c7de3467.

========

https://hg.mozilla.org/integration/gaia-central/rev/a1393369538a
Author: Wilson Page <wilsonpage@me.com>
Desc: Merge pull request #25879 from wilsonpage/1094779

Bug 1094779 - [camera] Unable to record videos if tmp.3gp exists in target video directory

========

https://hg.mozilla.org/integration/gaia-central/rev/5e170643f041
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1094779 - [camera] Unable to record videos if tmp.3gp exists in target video directory
2014-11-18 05:36:52 -08:00
Mark Finkle
9bb4760cab Bug 838332 - t.co links use JS redirection instead of a HTTP 301 r=rnewman 2014-11-18 08:16:52 -05:00
Jared Wein
c415ddd6d4 Bug 1099495 - Use moz10n.get instead of the aliased '__' function for consistency with the other files. r=NiKo` 2014-11-18 12:39:54 -05:00
Jared Wein
d4f91e3533 Bug 1074720 - Display partner logo depending on the locale on first-time experience. r=mikedeboer 2014-11-18 12:39:40 -05:00
Jared Wein
f40f731142 Bug 1083466 - Add a button to the Loop panel for the Getting Started tour. r=mikedeboer 2014-11-18 12:39:29 -05:00
Dave Townsend
eb32040724 Bug 1095128: Make sure add-on updates remain disabled after each browser chrome test. 2014-11-18 09:18:51 -08:00
Carsten "Tomcat" Book
d6019fb501 Merge mozilla-central to fx-team 2014-11-18 17:34:34 +01:00
Carsten "Tomcat" Book
f812b38313 Backed out changeset bce2fc00ba0e (bug 838332) for Android M8 Test failures 2014-11-18 15:56:58 +01:00