Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: mobile/android/moz.configure

Issue 29599632: Issue 5920 - Remove the requirement for specifying --with-adjust-sdk-keyfile in mozconfig (Closed)
Patch Set: Created Nov. 6, 2017, 4:24 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- 1 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
2 # vim: set filetype=python: 2 # vim: set filetype=python:
3 # This Source Code Form is subject to the terms of the Mozilla Public 3 # This Source Code Form is subject to the terms of the Mozilla Public
4 # License, v. 2.0. If a copy of the MPL was not distributed with this 4 # License, v. 2.0. If a copy of the MPL was not distributed with this
5 # file, You can obtain one at http://mozilla.org/MPL/2.0/. 5 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
6 6
7 project_flag('MOZ_ANDROID_EXCLUDE_FONTS', 7 project_flag('MOZ_ANDROID_EXCLUDE_FONTS',
8 help='Whether to exclude font files from the build', 8 help='Whether to exclude font files from the build',
9 default=True) 9 default=True)
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 # Must come after the ../../toolkit/moz.configure. 139 # Must come after the ../../toolkit/moz.configure.
140 @depends('MOZ_INSTALL_TRACKING', 'MOZ_NATIVE_DEVICES', '--with-adjust-sdk-keyfil e') 140 @depends('MOZ_INSTALL_TRACKING', 'MOZ_NATIVE_DEVICES', '--with-adjust-sdk-keyfil e')
141 def check_install_tracking(install_tracking, 141 def check_install_tracking(install_tracking,
142 native_devices, 142 native_devices,
143 adjust_sdk_keyfile): 143 adjust_sdk_keyfile):
144 if install_tracking: 144 if install_tracking:
145 if not native_devices: 145 if not native_devices:
146 die('You must specify MOZ_NATIVE_DEVICES=1 when' 146 die('You must specify MOZ_NATIVE_DEVICES=1 when'
147 ' building with MOZ_INSTALL_TRACKING=1') 147 ' building with MOZ_INSTALL_TRACKING=1')
148 if not adjust_sdk_keyfile: 148 if not adjust_sdk_keyfile:
149 die('You must specify --with-adjust-sdk-keyfile=/path/to/keyfile whe n' 149 # Using default if Adjust SDK keyfile is not specified
150 ' building with MOZ_INSTALL_TRACKING=1') 150 # See https://issues.adblockplus.org/ticket/5920
151 adjust_sdk_keyfile = "$topsrcdir/mobile/android/base/adjust-sdk-sand box.token"
151 152
152 # Must come after the ../../toolkit/moz.configure. 153 # Must come after the ../../toolkit/moz.configure.
153 @depends('MOZ_ANDROID_MMA', 154 @depends('MOZ_ANDROID_MMA',
154 'MOZ_NATIVE_DEVICES', 155 'MOZ_NATIVE_DEVICES',
155 'MOZ_ANDROID_GCM', 156 'MOZ_ANDROID_GCM',
156 '--with-leanplum-sdk-keyfile') 157 '--with-leanplum-sdk-keyfile')
157 def check_android_mma(android_mma, 158 def check_android_mma(android_mma,
158 native_devices, 159 native_devices,
159 android_gcm, 160 android_gcm,
160 leanplum_sdk_keyfile): 161 leanplum_sdk_keyfile):
161 if android_mma: 162 if android_mma:
162 if not native_devices: 163 if not native_devices:
163 die('You must specify MOZ_NATIVE_DEVICES=1 when' 164 die('You must specify MOZ_NATIVE_DEVICES=1 when'
164 ' building with MOZ_ANDROID_MMA=1') 165 ' building with MOZ_ANDROID_MMA=1')
165 if not android_gcm: 166 if not android_gcm:
166 die('You must specify MOZ_ANDROID_GCM=1 when' 167 die('You must specify MOZ_ANDROID_GCM=1 when'
167 ' building with MOZ_ANDROID_MMA=1') 168 ' building with MOZ_ANDROID_MMA=1')
168 if not leanplum_sdk_keyfile: 169 if not leanplum_sdk_keyfile:
169 die('You must specify --with-leanplum-sdk-keyfile=/path/to/keyfile w hen' 170 die('You must specify --with-leanplum-sdk-keyfile=/path/to/keyfile w hen'
170 ' building with MOZ_ANDROID_MMA=1') 171 ' building with MOZ_ANDROID_MMA=1')
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld