Bug 1259876 - Ensure defines in mobile/android/installer/moz.build make it to mobile/android/installer/package-manifest.in. r=nalexander
MozReview-Commit-ID: 6Hde6Q3fw6m
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -1,14 +1,12 @@
# 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/.
-STANDALONE_MAKEFILE := 1
-
# overwrite mobile-l10n.js with a matchOS=true one for multi-locale builds
ifeq ($(AB_CD),multi)
L10N_PREF_JS_EXPORTS = $(srcdir)/mobile-l10n.js
L10N_PREF_JS_EXPORTS_PATH = $(FINAL_TARGET)/$(PREF_DIR)
L10N_PREF_JS_EXPORTS_FLAGS = $(PREF_PPFLAGS) --silence-missing-directive-warnings
PP_TARGETS += L10N_PREF_JS_EXPORTS
endif
--- a/mobile/android/moz.build
+++ b/mobile/android/moz.build
@@ -19,16 +19,17 @@ DIRS += [
'base',
'chrome',
'components',
'modules',
'themes/core',
'app',
'fonts',
'geckoview_library',
+ 'installer',
]
if CONFIG['MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER']:
DIRS += ['bouncer'] # No ordering implied with respect to base.
TEST_DIRS += [
'tests',
]