Bug 1259876 - Ensure defines in mobile/android/installer/moz.build make it to mobile/android/installer/package-manifest.in. r=nalexander draft
authorChris Manchester <cmanchester@mozilla.com>
Fri, 25 Mar 2016 17:56:05 -0700
changeset 344877 9baeada0546afc78a5922cc08522dda1454f25ad
parent 344388 24c5fbde4488e06ef79905e1c520027cddcd1189
child 517062 185c2bb8bff5aeec77f1e7a55f4b4e09f0a1534a
push id13942
push usercmanchester@mozilla.com
push dateSat, 26 Mar 2016 00:56:22 +0000
reviewersnalexander
bugs1259876
milestone48.0a1
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
mobile/android/installer/Makefile.in
mobile/android/moz.build
--- 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',
 ]