Bug 1039157 - Remove useless non-Android build code from mobile/android/app. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 17 Jul 2014 08:42:16 +0900
changeset 216445 81a49ef88419d98c5a84e17fbfecf36ffcd4e643
parent 216444 4d1f2d26fef19d4facec49d728cf602fbb3cd1ac
child 216446 64d4dcf940f1e7e635f6cc0a59ba2182b1d95228
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1039157
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1039157 - Remove useless non-Android build code from mobile/android/app. r=nalexander
mobile/android/app/Makefile.in
mobile/android/app/moz.build
--- a/mobile/android/app/Makefile.in
+++ b/mobile/android/app/Makefile.in
@@ -1,33 +1,5 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-dist_dest = $(DIST)/$(APP_NAME).app
-
 PREF_JS_EXPORTS = $(srcdir)/mobile.js
-
-ifndef LIBXUL_SDK
-ifneq (Android,$(OS_TARGET))
-LIBS += \
-  $(XPCOM_STANDALONE_GLUE_LDOPTS) \
-  $(NULL)
-
-endif
-endif #LIBXUL_SDK
-
-# Make sure the standalone glue doesn't try to get libxpcom.so from mobile/app.
-NSDISTMODE = copy
-
-include $(topsrcdir)/config/rules.mk
-
-APP_BINARY = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-
-libs::
-ifdef LIBXUL_SDK
-	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY)
-endif
-ifdef LIBXUL_SDK
-	$(NSINSTALL) -D $(DIST)/bin/xulrunner
-	(cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -)
-endif
-	$(NSINSTALL) -D $(DIST)/bin/chrome/icons/default
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -1,26 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-if not CONFIG['LIBXUL_SDK']:
-    if CONFIG['OS_TARGET'] != 'Android':
-        PROGRAM = CONFIG['MOZ_APP_NAME']
-        DEFINES['XPCOM_GLUE'] = True
-        GENERATED_INCLUDES += ['/build']
-        LOCAL_INCLUDES += [
-            '/toolkit/xre',
-            '/xpcom/base',
-            '/xpcom/build',
-        ]
-        DISABLE_STL_WRAPPING = True
-
 for var in ('APP_NAME', 'APP_VERSION'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]
 
 for var in ('MOZ_UPDATER', 'MOZ_APP_UA_NAME'):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_PKG_SPECIAL']:
     DEFINES['MOZ_PKG_SPECIAL'] = CONFIG['MOZ_PKG_SPECIAL']