Merge mozilla-central to mozilla-inbound

Makefile.in

@@ -166,7 +166,11 @@ SYMBOL_INDEX_NAME = \
 buildsymbols:
 ifdef MOZ_CRASHREPORTER
 ifdef USE_ELF_HACK
-	$(MAKE) -C $(MOZ_BUILD_APP)/installer elfhack
+    ifeq (mobile,$(MOZ_BUILD_APP))
+		$(MAKE) -C mobile/xul/installer elfhack
+    else
+		$(MAKE) -C $(MOZ_BUILD_APP)/installer elfhack
+    endif
 endif
 	echo building symbol store
 	$(RM) -r $(DIST)/crashreporter-symbols

configure.in

@@ -4750,6 +4750,10 @@ if test -z "$MOZ_BUILD_APP"; then
   AC_MSG_RESULT([browser])
   MOZ_BUILD_APP=browser
 else
+  # default mobile to be mobile/xul
+  if test "$MOZ_BUILD_APP" = "mobile" ; then
+    MOZ_BUILD_APP=mobile/xul
+  fi
   # We have a valid application only if it has a build.mk file in its top
   # directory.
   if test ! -f "${srcdir}/${MOZ_BUILD_APP}/build.mk" ; then

mobile/branding/aurora/android-resources.mn

@@ -1,6 +0,0 @@
-mobile/app/android/drawable/alertaddons.png
-mobile/app/android/drawable/alertdownloads.png
-mobile/branding/aurora/content/splash.png
-mobile/branding/aurora/content/splash_v9.9.png
-mobile/branding/aurora/content/splash_v8.9.png
-mobile/branding/aurora/content/favicon32.png

mobile/branding/beta/android-resources.mn

@@ -1,6 +0,0 @@
-mobile/app/android/drawable/alertaddons.png
-mobile/app/android/drawable/alertdownloads.png
-mobile/branding/beta/content/splash.png
-mobile/branding/beta/content/splash_v9.9.png
-mobile/branding/beta/content/splash_v8.9.png
-mobile/branding/beta/content/favicon32.png

mobile/branding/nightly/android-resources.mn

@@ -1,6 +0,0 @@
-mobile/app/android/drawable/alertaddons.png
-mobile/app/android/drawable/alertdownloads.png
-mobile/branding/nightly/content/splash.png
-mobile/branding/nightly/content/splash_v9.9.png
-mobile/branding/nightly/content/splash_v8.9.png
-mobile/branding/nightly/content/favicon32.png

mobile/branding/official/android-resources.mn

@@ -1,6 +0,0 @@
-mobile/app/android/drawable/alertaddons.png
-mobile/app/android/drawable/alertdownloads.png
-mobile/branding/official/content/splash.png
-mobile/branding/official/content/splash_v9.9.png
-mobile/branding/official/content/splash_v8.9.png
-mobile/branding/official/content/favicon32.png

mobile/branding/unofficial/Makefile.in

@@ -1,49 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Mozilla Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Justin Dolske <dolske@mozilla.com> (original author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = \
-	content \
-	locales \
-	$(NULL)
-
-include $(topsrcdir)/config/rules.mk

mobile/branding/unofficial/android-resources.mn

@@ -1,6 +0,0 @@
-mobile/app/android/drawable/alertaddons.png
-mobile/app/android/drawable/alertdownloads.png
-mobile/branding/unofficial/content/splash.png
-mobile/branding/unofficial/content/splash_v9.9.png
-mobile/branding/unofficial/content/splash_v8.9.png
-mobile/branding/unofficial/content/favicon32.png

mobile/branding/unofficial/content/Makefile.in

@@ -1,25 +0,0 @@
-# Branding Makefile
-#  - jars chrome artwork
-
-DEPTH = ../../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-LINUX_BRANDING_FILES = \
-	fennec_26x26.png \
-	fennec_40x40.png \
-	fennec_48x48.png \
-	fennec_72x72.png \
-	fennec_scalable.png \
-	fennec_maemo_icon26.txt \
-	$(NULL)
-
-export::
-	$(NSINSTALL) -D $(DIST)/branding
-	cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
-	$(NSINSTALL) -D $(DIST)/install

mobile/xul/Makefile.in

@@ -36,7 +36,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH      = ..
+DEPTH      = ../..
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@

mobile/xul/app/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH     = ../..
+DEPTH     = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@

mobile/xul/app/profile/extensions/Makefile.in

@@ -35,7 +35,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../..
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@

mobile/xul/branding/aurora/Makefile.in

@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../..
+DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@

mobile/xul/branding/aurora/android-resources.mn

@@ -0,0 +1,6 @@
+mobile/xul/app/android/drawable/alertaddons.png
+mobile/xul/app/android/drawable/alertdownloads.png
+mobile/xul/branding/aurora/content/splash.png
+mobile/xul/branding/aurora/content/splash_v9.9.png
+mobile/xul/branding/aurora/content/splash_v8.9.png
+mobile/xul/branding/aurora/content/favicon32.png

mobile/xul/branding/aurora/content/Makefile.in

@@ -1,7 +1,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = ../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@

mobile/xul/branding/aurora/locales/Makefile.in

@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH          = ../../../..
+DEPTH          = ../../../../..
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@

mobile/xul/branding/beta/Makefile.in

@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../..
+DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@

mobile/xul/branding/beta/android-resources.mn

@@ -0,0 +1,6 @@
+mobile/xul/app/android/drawable/alertaddons.png
+mobile/xul/app/android/drawable/alertdownloads.png
+mobile/xul/branding/beta/content/splash.png
+mobile/xul/branding/beta/content/splash_v9.9.png
+mobile/xul/branding/beta/content/splash_v8.9.png
+mobile/xul/branding/beta/content/favicon32.png

mobile/xul/branding/beta/content/Makefile.in

@@ -1,7 +1,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = ../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@

mobile/xul/branding/beta/locales/Makefile.in

@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH          = ../../../..
+DEPTH          = ../../../../..
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@

mobile/xul/branding/nightly/Makefile.in

@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH = ../../..
+DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@

mobile/xul/branding/nightly/android-resources.mn

@@ -0,0 +1,6 @@
+mobile/xul/app/android/drawable/alertaddons.png
+mobile/xul/app/android/drawable/alertdownloads.png
+mobile/xul/branding/nightly/content/splash.png
+mobile/xul/branding/nightly/content/splash_v9.9.png
+mobile/xul/branding/nightly/content/splash_v8.9.png
+mobile/xul/branding/nightly/content/favicon32.png

mobile/xul/branding/nightly/content/Makefile.in

@@ -1,7 +1,7 @@
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = ../../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@

mobile/xul/branding/nightly/locales/Makefile.in

@@ -34,7 +34,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH          = ../../../..
+DEPTH          = ../../../../..
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@