mobile/android/confvars.sh - Issue 5823470080360448: Set the branding via confvars.sh

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: mobile/android/confvars.sh

Issue 5823470080360448: Set the branding via confvars.sh (Closed)

Patch Set: Created Jan. 26, 2015, 3:10 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

« README.md ('K') | « README.md ('k') | no next file » | no next file with comments »

OLD	NEW
1 # This Source Code Form is subject to the terms of the Mozilla Public	1 # This Source Code Form is subject to the terms of the Mozilla Public

2 # License, v. 2.0. If a copy of the MPL was not distributed with this	2 # License, v. 2.0. If a copy of the MPL was not distributed with this

3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.	3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

4	4

5 MOZ_APP_BASENAME=Fennec	5 MOZ_APP_BASENAME=Fennec

6 MOZ_APP_VENDOR=Mozilla	6 MOZ_APP_VENDOR=Mozilla

7	7

8 MOZ_APP_VERSION=34.0	8 MOZ_APP_VERSION=34.0

9 MOZ_APP_UA_NAME=Firefox	9 MOZ_APP_UA_NAME=Firefox

10	10

11 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial	11 MOZ_BRANDING_DIRECTORY=mobile/android/branding/adblockbrowser
	René Jeschke 2015/02/18 14:52:30 The ABP branding isn't in the repository yet, did The ABP branding isn't in the repository yet, did I already reviewed this? Felix Dahlke 2015/02/18 15:02:28 Yup, this is based on: http://codereview.adblockpl Show quoted text On 2015/02/18 14:52:30, René Jeschke wrote: > The ABP branding isn't in the repository yet, did I already reviewed this? Yup, this is based on: http://codereview.adblockplus.org/6349873972510720/ In a nutshell: We don't have to mess with .mozconfig anymore, we can just follow the official build guide. I'm mildly worried about that one getting out of sync with our version, but that's a different problem. René Jeschke 2015/02/18 15:07:26 Ah, right :-D thanks Show quoted text On 2015/02/18 15:02:28, Felix H. Dahlke wrote: > On 2015/02/18 14:52:30, René Jeschke wrote: > > The ABP branding isn't in the repository yet, did I already reviewed this? > > Yup, this is based on: http://codereview.adblockplus.org/6349873972510720/ > > In a nutshell: We don't have to mess with .mozconfig anymore, we can just follow > the official build guide. I'm mildly worried about that one getting out of sync > with our version, but that's a different problem. Ah, right :-D thanks
12 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official	12 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/adblockbrowser

13 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh	13 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh

14	14

15 # We support Android SDK version 9 and up by default.	15 # We support Android SDK version 9 and up by default.

16 # See the --enable-android-min-sdk and --enable-android-max-sdk arguments in con figure.in.	16 # See the --enable-android-min-sdk and --enable-android-max-sdk arguments in con figure.in.

17 MOZ_ANDROID_MIN_SDK_VERSION=9	17 MOZ_ANDROID_MIN_SDK_VERSION=9

18	18

19 MOZ_SAFE_BROWSING=1	19 MOZ_SAFE_BROWSING=1

20	20

21 MOZ_DISABLE_CRYPTOLEGACY=1	21 MOZ_DISABLE_CRYPTOLEGACY=1

22	22

(...skipping 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
81 MOZ_ANDROID_SEARCH_ACTIVITY=	81 MOZ_ANDROID_SEARCH_ACTIVITY=

82 fi	82 fi

83	83

84 # Enable the share handler in pre-release builds.	84 # Enable the share handler in pre-release builds.

85 if test ! "$RELEASE_BUILD"; then	85 if test ! "$RELEASE_BUILD"; then

86 MOZ_ANDROID_SHARE_OVERLAY=1	86 MOZ_ANDROID_SHARE_OVERLAY=1

87 fi	87 fi

88	88

89 # Don't enable the Mozilla Location Service stumbler.	89 # Don't enable the Mozilla Location Service stumbler.

90 # MOZ_ANDROID_MLS_STUMBLER=1	90 # MOZ_ANDROID_MLS_STUMBLER=1

OLD	NEW