Commit Graph

156114 Commits

Author SHA1 Message Date
Nick Alexander
ea34b572fc Bug 934646 - Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
--HG--
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-11-18 09:31:55 -08:00
Nick Alexander
9570465921 Bug 934646 - Replace hard-coded Android resource ID. r=mfinkle 2013-11-07 15:01:54 -05:00
Nick Alexander
0491074aba Bug 934646 - Delete unused resources. r=mfinkle
These resources weren't defined in moz.build, so they were never
copied to $OBJDIR/mobile/android/base/res.  This means they could not
have been referenced by the system.  (Of course, text search turns up
zero uses as well.)
2013-11-06 17:52:52 -05:00
Ehsan Akhgari
fa64c8ac46 Bug 939571 - Build Web Audio in unified mode; r=glandium 2013-11-19 14:11:16 -05:00
Ehsan Akhgari
ba57b7d723 Bug 939580 - #include LOCAL_INCLUDES after the source dir and current dir includes; r=gps 2013-11-19 14:10:15 -05:00
Gregory Szorc
7715dfb078 Bug 939080 - Allow support-files in manifests to exist in parent paths; r=ted
--HG--
extra : rebase_source : fcbd7e71efacde1151d4142132312291e297bc68
extra : amend_source : 0c78233f8b853654af474c54de6869ce55aa0533
2013-11-18 11:55:33 -08:00
Ryan VanderMeulen
7db9c39392 Merge m-c to inbound.
--HG--
rename : dom/contacts/tests/test_contacts_upgrade.html => dom/contacts/tests/test_contacts_upgrade.xul
rename : dom/indexedDB/test/test_globalObjects.xul => dom/indexedDB/test/test_globalObjects_chrome.xul
rename : dom/indexedDB/test/test_globalObjects.html => dom/indexedDB/test/test_globalObjects_content.html
rename : dom/indexedDB/test/unit/test_globalObjects.js => dom/indexedDB/test/unit/test_globalObjects_xpc.js
2013-11-19 13:54:20 -05:00
Ryan VanderMeulen
57c7242365 Merge fx-team to m-c. 2013-11-19 13:44:45 -05:00
Nikhil Marathe
b0155d1bda Bug 882076 - C++ callbacks to DOM Promises. r=baku,mccr8 2013-11-19 10:43:51 -08:00
Nikhil Marathe
800ae30ca1 Bug 939909 - Get rid of Optional<> from internal Promise functions. r=bz
--HG--
extra : rebase_source : bcf49b1b593504aeb619f4bbd16028e57861641b
2013-11-19 10:39:51 -08:00
Ryan VanderMeulen
c9f7db66a5 Merge b2g-inbound to m-c. 2013-11-19 13:36:41 -05:00
Ryan VanderMeulen
7627a06670 Merge inbound to m-c. 2013-11-19 13:21:57 -05:00
Ryan VanderMeulen
a546d9ed17 Backed out changeset 430ebb28dd92 (bug 935753) for mochitest-bc failures. 2013-11-19 13:13:06 -05:00
Brandon Cheng
bfe92af8bb Bug 873626 - [Australis] Fix issue with specificity of nav-bar padding on Linux; r=dao
--HG--
extra : rebase_source : 0358784ed48ed4c8dc232530f8981ed1e44d02c0
2013-11-19 11:13:17 -05:00
Jared Wein
9fc54e4152 Bug 935753 - Firefox displays the "This is a secure Firefox page" indicator on pages served by addons. r=MattN
--HG--
extra : rebase_source : 20c3720bfc749401956ffa4553b9df2153231c3d
2013-11-19 11:11:25 -05:00
Irving Reid
10daa90f8d Bug 940014: Telemetry on time and number of items scanned per addon during startup; r=Unfocused 2013-11-19 10:51:44 -05:00
Gaia Pushbot
db791bea5a Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/4e8959a60a4e
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Merge pull request #13794 from Rik/conference-call-hold-925359

Bug 925359 - Tapping on the Group call layer holds the call r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/beee198737cc
Author: Anthony Ricaud <anthony@ricaud.me>
Desc: Bug 925359 - Tapping on the Group call layer holds the call
2013-11-19 07:30:23 -08:00
Irving Reid
26d635a3b6 Bug 938689: Structured comparison of add-on directory state; r=Unfocused 2013-11-19 10:27:18 -05:00
Ryan VanderMeulen
51ab56ef96 Backed out 7 changesets (bug 913985) for intermittent Android crashes.
Backed out changeset 53513a959cf0 (bug 913985)
Backed out changeset d23d1e678417 (bug 913985)
Backed out changeset a9c9187b4f4a (bug 913985)
Backed out changeset c6b02e4a3e35 (bug 913985)
Backed out changeset 895dae322e3c (bug 913985)
Backed out changeset 3d97e6a53313 (bug 913985)
Backed out changeset 892bb017f8ba (bug 913985)

--HG--
rename : build/annotationProcessors/AnnotationInfo.java => build/annotationProcessors/MethodWithAnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java => build/annotationProcessors/utils/AlphabeticMethodComparator.java
rename : build/annotationProcessors/utils/GeneratableElementIterator.java => build/annotationProcessors/utils/GeneratableEntryPointIterator.java
rename : mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java => mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java
rename : mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java => mobile/android/base/mozglue/OptionalGeneratedParameter.java
2013-11-19 10:56:09 -05:00
Lucas Rocha
0151a54be9 Bug 937641 - Move toolbar-related classes to the toolbar package (r=sriram)
--HG--
rename : mobile/android/base/AutocompleteHandler.java => mobile/android/base/toolbar/AutocompleteHandler.java
rename : mobile/android/base/BackButton.java => mobile/android/base/toolbar/BackButton.java
rename : mobile/android/base/BrowserToolbar.java => mobile/android/base/toolbar/BrowserToolbar.java
rename : mobile/android/base/BrowserToolbarBackground.java => mobile/android/base/toolbar/BrowserToolbarBackground.java
rename : mobile/android/base/CanvasDelegate.java => mobile/android/base/toolbar/CanvasDelegate.java
rename : mobile/android/base/ForwardButton.java => mobile/android/base/toolbar/ForwardButton.java
rename : mobile/android/base/PageActionLayout.java => mobile/android/base/toolbar/PageActionLayout.java
rename : mobile/android/base/ShapedButton.java => mobile/android/base/toolbar/ShapedButton.java
rename : mobile/android/base/TabCounter.java => mobile/android/base/toolbar/TabCounter.java
2013-11-19 15:46:48 +00:00
Gaia Pushbot
b202cec6e0 Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/2d283425987b
Author: Zac <zcampbell@mozilla.com>
Desc: Merge pull request #13607 from JohanLorenzo/calendar-app-object

Bug 937532 - Migrate calendar tests to use an app object

========

https://hg.mozilla.org/integration/gaia-central/rev/dfbf59aca77c
Author: Johan LORENZO <johan.lorenzo@gmail.com>
Desc: Bug 937532 - Migrate calendar tests to use an app object
2013-11-19 07:05:24 -08:00
Jan Beich
76f1c6a0a4 Bug 810716 - Detect res_ninit() on DragonFly and FreeBSD. r=ted 2013-11-19 15:42:55 +01:00
James Willcox
12347a348f Bug 928804 - Always use an up-to-date texture transform when compositing SharedTextureSourceOGL r=nical 2013-11-19 08:41:57 -06:00
Johannes Buchner
6027e415af Bug 912465 - Use MsgNewSafeBufferedFileOutputStream instead of NewLocalFileOutputStream in various places. r=ehsan 2013-11-19 09:13:44 -05:00
Michael Shuen
f230d5398c Bug 939471 - Fix typo in gcparam() error message. r=luke 2013-11-19 09:09:53 -05:00
James Kitchener
ec8e8ed609 Bug 936886 - Account for possibility of non-null terminated strings in nsWindowsRegKey::ReadStringValue(). r=dmajor 2013-11-19 09:09:41 -05:00
Carsten "Tomcat" Book
639d0aeee5 Backed out changeset 161bfee3f57a (bug 939608) for fixing PGO Build Bustage 2013-11-19 13:26:41 +01:00
Carsten "Tomcat" Book
042463206d Backed out changeset 21df28ade757 (bug 939608) for fixing PGO Build Failures 2013-11-19 13:25:27 +01:00
Nicholas Nethercote
bcdbb4d8cc Bug 940069 - Land a temporary debugging printf that runs on --enable-valgrind builds only, because Valgrind runs aren't available on tryserver. r=me. 2013-11-18 23:13:15 -08:00
Mike Hommey
931cb49886 Bug 939632 - Remove LIBRARY_NAME for leaf libraries. r=gps
Landing on a CLOSED TREE.
2013-11-19 11:50:54 +09:00
Mike Hommey
9c3682bcd9 Bug 939632 - Allow LIBRARY_NAME to be omitted when FINAL_LIBRARY is defined. r=gps 2013-11-19 11:48:13 +09:00
Mike Hommey
db9e5129bc Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps 2013-11-19 11:48:10 +09:00
Mike Hommey
56b313a90d Bug 939074 - Infer LIBXUL_LIBRARY from FINAL_LIBRARY. r=gps 2013-11-19 11:47:52 +09:00
Mike Hommey
9ec00225de Bug 939622 - Remove LIBXUL_LIBRARY for intermediate libs that end up in gkmedias. r=gps
What LIBXUL_LIBRARY does is:
  - Imply FORCE_STATIC_LIB
  - Build with -DIMPL_LIBXUL
  - Build with -DMOZILLA_INTERNAL_API

Those intermediate libs that end up in gkmedias and have LIBXUL_LIBRARY defined
in their moz.build are all third party code (or handled like third party code).
Besides FORCE_STATIC_LIB, none of the side effects of LIBXUL_LIBRARY should be
needed.
2013-11-19 11:47:49 +09:00
Mike Hommey
f94778cdf9 Bug 939071 - Kill SHORT_LIBNAME. r=ted 2013-11-19 11:47:47 +09:00
Mike Hommey
636b672657 Bug 914245 - Move FORCE_SHARED_LIB to moz.build. r=mshal 2013-11-19 11:47:45 +09:00
Mike Hommey
3b185d79c9 Bug 939044 - Make the build frontend and backend forget about MODULE. r=gps 2013-11-19 11:47:44 +09:00
Mike Hommey
b18be7aacd Bug 939044 - Rename remaining MODULE definitions to XPIDL_MODULE. r=mshal 2013-11-19 11:47:43 +09:00
Mike Hommey
f0d1cd1e10 Bug 939044 - Remove most definitions of MODULE. r=mshal 2013-11-19 11:47:39 +09:00
Mike Hommey
094cb7c044 Bug 939044 - Remove the last uses of the MODULE variable in makefiles. r=gps 2013-11-19 11:47:30 +09:00
Mike Hommey
b73ed76683 Bug 939042 - Remove library building related variables in directories that build no C/C++ sources. r=mshal 2013-11-19 11:47:29 +09:00
Mike Hommey
9c5c5d8f00 Bug 939039 - Remove now useless FORCE_STATIC_LIB definitions. r=gps 2013-11-19 11:47:28 +09:00
Mike Hommey
f85ec564e8 Bug 939039 - Make FINAL_LIBRARY imply FORCE_STATIC_LIB. r=gps
This also moves the LIBXUL_LIBRARY implies FORCE_STATIC_LIB test in the emitter
instead of config.mk, since both variables are defined in moz.build exclusively.
backend.mk can end up with both LIBXUL_LIBRARY and FORCE_STATIC_LIB defined, but
it's just fine.
2013-11-19 11:47:26 +09:00
Mike Hommey
71b60fe95d Bug 935881 - Remove SHARED_LIBRARY_LIBS handling for moz.build. r=gps 2013-11-19 11:47:18 +09:00
Mike Hommey
f81885e53b Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps 2013-11-19 11:47:14 +09:00
Mike Hommey
015bd905d7 Bug 935881 - Add a FINAL_LIBRARY variable to use in moz.build. r=gps
This will be used to declare in what shared library or intermediate static
library objects are going to be linked into.
2013-11-19 11:46:42 +09:00
Mike Hommey
cf857e87f3 Bug 935881 - Make libxul's LIBRARY_NAME 'xul' on mac. r=gps 2013-11-19 11:46:40 +09:00
Wes Kocher
227b9b8a2c Merge inbound to m-c on a CLOSED TREE 2013-11-18 18:30:47 -08:00
Wes Kocher
d600490156 Merge fx-team to m-c on a CLOSED TREE 2013-11-18 18:25:57 -08:00
Wes Kocher
5dbb537c3e Backed out 2 changesets (bug 932783, bug 937750) for unrelated mochitest-metro test bustage on a CLOSED TREE
Backed out changeset 7acfc449097b (bug 937750)
Backed out changeset 3bde0e601ab8 (bug 932783)
2013-11-18 17:45:17 -08:00