Skip to content
Snippets Groups Projects
Commit 24935e03 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1039157 - Remove useless non-Android build code from mobile/android/app. r=nalexander

parent 72839c73
No related merge requests found
......@@ -2,32 +2,4 @@
# 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
......@@ -4,18 +4,6 @@
# 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]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment