mobile/android/confvars.sh - Issue 29330952: Issue 3127 - Merge conflicts, base 42.0.1

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 29330952: Issue 3127 - Merge conflicts, base 42.0.1 (Closed)

Patch Set: Created Nov. 26, 2015, 11:01 a.m.

Left:
Right:

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

Jump to:

View unified diff | Download patch

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=$FIREFOX_VERSION	8 MOZ_APP_VERSION=1.1.0

9 MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY	9 MOZ_APP_VERSION_DISPLAY=$MOZ_APP_VERSION

10 MOZ_APP_UA_NAME=Firefox	10 MOZ_APP_UA_NAME=Firefox

11	11

12 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial	12 MOZ_BRANDING_DIRECTORY=mobile/android/branding/adblockbrowser

13 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official	13 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/adblockbrowser

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

15	15

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

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

18 MOZ_ANDROID_MIN_SDK_VERSION=9	18 MOZ_ANDROID_MIN_SDK_VERSION=9

19	19

20 # There are several entry points into the Firefox application. These are the na mes of some of the classes that are	20 # There are several entry points into the Firefox application. These are the na mes of some of the classes that are

21 # listed in the Android manifest. They are specified in here to avoid hard-codi ng them in source code files.	21 # listed in the Android manifest. They are specified in here to avoid hard-codi ng them in source code files.

22 MOZ_ANDROID_APPLICATION_CLASS=org.mozilla.gecko.GeckoApplication	22 MOZ_ANDROID_APPLICATION_CLASS=org.mozilla.gecko.GeckoApplication

23 MOZ_ANDROID_BROWSER_INTENT_CLASS=org.mozilla.gecko.BrowserApp	23 MOZ_ANDROID_BROWSER_INTENT_CLASS=org.mozilla.gecko.BrowserApp

(...skipping 18 matching lines...) Expand all Loading...
42 MOZ_CAPTURE=1	42 MOZ_CAPTURE=1

43 MOZ_RAW=1	43 MOZ_RAW=1

44 MOZ_PLACES=	44 MOZ_PLACES=

45 MOZ_SOCIAL=	45 MOZ_SOCIAL=

46 MOZ_ANDROID_HISTORY=1	46 MOZ_ANDROID_HISTORY=1

47 MOZ_DISABLE_EXPORT_JS=1	47 MOZ_DISABLE_EXPORT_JS=1

48	48

49 # use custom widget for html:select	49 # use custom widget for html:select

50 MOZ_USE_NATIVE_POPUP_WINDOWS=1	50 MOZ_USE_NATIVE_POPUP_WINDOWS=1

51	51

52 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}	52 MOZ_APP_ID={55aba3ac-94d3-41a8-9e25-5c21fe874539}

53	53

54 MOZ_APP_STATIC_INI=1	54 MOZ_APP_STATIC_INI=1

55	55

56 # Enable on-demand decompression. This requires a host compile toolchain to	56 # Enable on-demand decompression. This requires a host compile toolchain to

57 # build szip to use during packaging.	57 # build szip to use during packaging.

58 if test "$COMPILE_ENVIRONMENT"; then	58 if test "$COMPILE_ENVIRONMENT"; then

59 MOZ_ENABLE_SZIP=1	59 MOZ_ENABLE_SZIP=1

60 fi	60 fi

61	61

62 # Enable navigator.mozPay	62 # Enable navigator.mozPay

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 MOZ_ANDROID_TAB_QUEUE=1	104 MOZ_ANDROID_TAB_QUEUE=1

105	105

106 # Use the low-memory GC tuning.	106 # Use the low-memory GC tuning.

107 export JS_GC_SMALL_CHUNK_SIZE=1	107 export JS_GC_SMALL_CHUNK_SIZE=1

108	108

109 # Enable Firefox Account avatars.	109 # Enable Firefox Account avatars.

110 MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=1	110 MOZ_ANDROID_FIREFOX_ACCOUNT_PROFILES=1

111	111

112 # Enable checking that add-ons are signed by the trusted root	112 # Enable checking that add-ons are signed by the trusted root

113 MOZ_ADDON_SIGNING=1	113 MOZ_ADDON_SIGNING=1

OLD	NEW

« no previous file with comments | « mobile/android/base/strings.xml.in ('k') | mobile/locales/en-US/chrome/region.properties » ('j') | no next file with comments »