Bug 857419 - Follow-up: don't build services/{datareporting,healthreport} on Android. r=rnewman
authorNick Alexander <nalexander@mozilla.com>
Sun, 12 May 2013 20:31:53 -0700
changeset 131662 7130e5134a6e34cc4873c60b9c0eb2af03dee490
parent 131661 0c854002b29f5940204a880baea2bbf3491faa72
child 131663 6d8a73f77af35ef3f4eaa72bcd7c0e098dfd1c40
child 131752 451cb6b4981f3e3cbeb3a631e92ef2dd7fed5460
push id24666
push usernalexander@mozilla.com
push dateMon, 13 May 2013 03:38:41 +0000
treeherderautoland@7130e5134a6e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman
bugs857419
milestone23.0a1
first release with
nightly linux32
7130e5134a6e / 23.0a1 / 20130513031057 / files
nightly linux64
7130e5134a6e / 23.0a1 / 20130513031057 / files
nightly mac
7130e5134a6e / 23.0a1 / 20130513031057 / files
nightly win32
7130e5134a6e / 23.0a1 / 20130513031057 / files
nightly win64
7130e5134a6e / 23.0a1 / 20130513031057 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 857419 - Follow-up: don't build services/{datareporting,healthreport} on Android. r=rnewman
services/moz.build
--- a/services/moz.build
+++ b/services/moz.build
@@ -4,19 +4,22 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += [
     'common',
     'crypto',
 ]
 
-if CONFIG['MOZ_SERVICES_HEALTHREPORT']:
-    PARALLEL_DIRS += ['healthreport']
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+    # MOZ_SERVICES_HEALTHREPORT and therefore MOZ_DATA_REPORTING are
+    # defined on Android, but these features are implemented using Java.
+    if CONFIG['MOZ_SERVICES_HEALTHREPORT']:
+        PARALLEL_DIRS += ['healthreport']
 
-if CONFIG['MOZ_DATA_REPORTING']:
-    PARALLEL_DIRS += ['datareporting']
+    if CONFIG['MOZ_DATA_REPORTING']:
+        PARALLEL_DIRS += ['datareporting']
 
 if CONFIG['MOZ_SERVICES_METRICS']:
     PARALLEL_DIRS += ['metrics']
 
 if CONFIG['MOZ_SERVICES_SYNC']:
     PARALLEL_DIRS += ['sync']