Side by Side Diff: mobile/android/confvars.sh
Issue 29322687:
Issue 2807 - MOBILE3901_2015070622_RELBRANCH merge conflicts (Closed)
Patch Set:
Created July 20, 2015, 4:53 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« mobile/android/base/BrowserApp.java ('K')
|
« mobile/android/base/BrowserApp.java ('k')
|
security/manager/ssl/tests/unit/tlsserver/cert9.db » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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=1.0.0 | 8 MOZ_APP_VERSION=1.0.0 |
| 9 MOZ_APP_UA_NAME=Firefox | 9 MOZ_APP_UA_NAME=Firefox |
| 10 | 10 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 60 | 60 |
| 61 # Enable second screen and casting support for external devices. | 61 # Enable second screen and casting support for external devices. |
| 62 MOZ_DEVICES=1 | 62 MOZ_DEVICES=1 |
| 63 | 63 |
| 64 # Enable second screen using native Android libraries, provided we're | 64 # Enable second screen using native Android libraries, provided we're |
| 65 # not resource constrained. | 65 # not resource constrained. |
| 66 if test -z "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then | 66 if test -z "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then |
| 67 MOZ_NATIVE_DEVICES=1 | 67 MOZ_NATIVE_DEVICES=1 |
| 68 fi | 68 fi |
| 69 | 69 |
| 70 # Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES | |
| 71 # is a proxy flag for that support. | |
| 72 if test "$RELEASE_BUILD"; then | |
| 73 if test "$MOZ_NATIVE_DEVICES"; then | |
| 74 MOZ_INSTALL_TRACKING=1 | |
|
Felix Dahlke
2015/07/22 16:19:19
Is this going to send data to Mozilla? We should c
| |
| 75 fi | |
| 76 fi | |
| 77 | |
| 70 # Mark as WebGL conformant | 78 # Mark as WebGL conformant |
| 71 MOZ_WEBGL_CONFORMANT=1 | 79 MOZ_WEBGL_CONFORMANT=1 |
| 72 | 80 |
| 73 # Enable the Search Activity. | 81 # Enable the Search Activity. |
| 74 MOZ_ANDROID_SEARCH_ACTIVITY=1 | 82 MOZ_ANDROID_SEARCH_ACTIVITY=1 |
| 75 | 83 |
| 76 # Use the new tablet UI. This will go away in Bug 1106935. | |
| 77 MOZ_ANDROID_NEW_TABLET_UI=1 | |
| 78 | |
| 79 # Enable the share handler. | 84 # Enable the share handler. |
| 80 MOZ_ANDROID_SHARE_OVERLAY=1 | 85 MOZ_ANDROID_SHARE_OVERLAY=1 |
| 81 | 86 |
| 82 # Enable the Mozilla Location Service stumbler. | 87 # Enable the Mozilla Location Service stumbler. |
| 83 MOZ_ANDROID_MLS_STUMBLER=1 | 88 MOZ_ANDROID_MLS_STUMBLER=1 |
| 84 | 89 |
| 85 # Enable adding to the system downloads list in pre-release builds. | 90 # Enable adding to the system downloads list in pre-release builds. |
| 86 MOZ_ANDROID_DOWNLOADS_INTEGRATION=1 | 91 MOZ_ANDROID_DOWNLOADS_INTEGRATION=1 |
| 87 | 92 |
| 88 # Use the low-memory GC tuning. | 93 # Use the low-memory GC tuning. |
| 89 export JS_GC_SMALL_CHUNK_SIZE=1 | 94 export JS_GC_SMALL_CHUNK_SIZE=1 |
| OLD | NEW |
« mobile/android/base/BrowserApp.java ('K')
|
« mobile/android/base/BrowserApp.java ('k')
|
security/manager/ssl/tests/unit/tlsserver/cert9.db » ('j')
|
no next file with comments »
