Unified 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.
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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: mobile/android/confvars.sh |
| diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh |
| index 535daf74780a1efe2b675df839d9cbd4e3a3250a..0d3e0d0c483e8196d7396b1328be80a3f38c8e00 100644 |
| --- a/mobile/android/confvars.sh |
| +++ b/mobile/android/confvars.sh |
| @@ -67,15 +67,20 @@ if test -z "$MOZ_ANDROID_RESOURCE_CONSTRAINED"; then |
| MOZ_NATIVE_DEVICES=1 |
| fi |
| +# Enable install tracking SDK if we have Google Play support; MOZ_NATIVE_DEVICES |
| +# is a proxy flag for that support. |
| +if test "$RELEASE_BUILD"; then |
| +if test "$MOZ_NATIVE_DEVICES"; then |
| + MOZ_INSTALL_TRACKING=1 |
|
Felix Dahlke
2015/07/22 16:19:19
Is this going to send data to Mozilla? We should c
|
| +fi |
| +fi |
| + |
| # Mark as WebGL conformant |
| MOZ_WEBGL_CONFORMANT=1 |
| # Enable the Search Activity. |
| MOZ_ANDROID_SEARCH_ACTIVITY=1 |
| -# Use the new tablet UI. This will go away in Bug 1106935. |
| -MOZ_ANDROID_NEW_TABLET_UI=1 |
| - |
| # Enable the share handler. |
| MOZ_ANDROID_SHARE_OVERLAY=1 |
« 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 »
