Bug 1475573 - Create --enable-fuzzing debug build job for Android x86 firefox. r=nalexander,froydnj

Differential Revision: https://phabricator.services.mozilla.com/D2428

--HG--
extra : moz-landing-system : lando

Author: jschwartzentruber

build/gecko_templates.mozbuild

@@ -36,6 +36,15 @@ def GeckoBinary(linkage='dependent', mozglue=None):
     elif linkage != None:
         error('`linkage` must be "dependent", "standalone" or None')
 
+    if CONFIG['LIBFUZZER']:
+        assert mozglue is not None, 'libfuzzer depends on "mozglue"'
+        USE_LIBS += [
+            'fuzzer'
+        ]
+        LOCAL_INCLUDES += [
+            '/tools/fuzzing/libfuzzer'
+        ]
+
     if mozglue:
         LDFLAGS += CONFIG['MOZ_GLUE_WRAP_LDFLAGS']
         if mozglue == 'program':

ipc/app/moz.build

@@ -23,6 +23,15 @@ LOCAL_INCLUDES += [
     '/xpcom/base',
 ]
 
+if CONFIG['LIBFUZZER']:
+    USE_LIBS += [
+        'fuzzer',
+        'mozglue'
+    ]
+    LOCAL_INCLUDES += [
+        '/tools/fuzzing/libfuzzer',
+    ]
+
 # DELAYLOAD_DLLS in this block ensures that the DLL blocklist is functional
 if CONFIG['OS_ARCH'] == 'WINNT':
     DELAYLOAD_DLLS += [

mobile/android/config/mozconfigs/android-x86/debug-fuzzing

@@ -0,0 +1,13 @@
+. "$topsrcdir/mobile/android/config/mozconfigs/android-x86/debug"
+
+# Remove unwanted environment variables from the 'debug' mozconfig.
+unset MOZILLA_OFFICIAL
+unset MOZ_TELEMETRY_REPORTING
+unset MOZ_ANDROID_POCKET
+
+ac_add_options --enable-fuzzing
+
+# This adds '-fuzzing' to the APK filename for local builds.
+export MOZ_PKG_SPECIAL=fuzzing
+
+. "$topsrcdir/mobile/android/config/mozconfigs/common.override"

taskcluster/ci/build/android.yml

@@ -155,6 +155,56 @@ android-x86/opt:
         - linux64-sccache
         - linux64-node
 
+android-x86-fuzzing/debug:
+    description: "Android x86 Fuzzing Debug"
+    index:
+        product: mobile
+        job-name: android-x86-fuzzing-debug
+    treeherder:
+        platform: android-4-2-x86/debug
+        symbol: Bf
+    worker-type: aws-provisioner-v1/gecko-{level}-b-android
+    worker:
+        docker-image: {in-tree: android-build}
+        max-run-time: 7200
+        env:
+            GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
+            TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+        artifacts:
+            - name: public/android/R
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/app/R
+              type: directory
+            - name: public/android/maven
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/maven/
+              type: directory
+            - name: public/build/geckoview-androidTest.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview/outputs/apk/androidTest/officialWithGeckoBinariesNoMinApi/debug/geckoview-official-withGeckoBinaries-noMinApi-debug-androidTest.apk
+              type: file
+            - name: public/build/geckoview_example.apk
+              path: /builds/worker/workspace/build/src/obj-firefox/gradle/build/mobile/android/geckoview_example/outputs/apk/officialWithGeckoBinariesNoMinApi/debug/geckoview_example-official-withGeckoBinaries-noMinApi-debug.apk
+              type: file
+            - name: public/build
+              path: /builds/worker/artifacts/
+              type: directory
+    run:
+        using: mozharness
+        actions: [get-secrets build multi-l10n update]
+        config:
+            - builds/releng_base_android_64_builds.py
+        script: "mozharness/scripts/fx_desktop_build.py"
+        secrets: true
+        custom-build-variant-cfg: x86-fuzzing-debug
+        tooltool-downloads: internal
+    toolchains:
+        - android-gradle-dependencies
+        - android-ndk-linux
+        - android-sdk-linux
+        - linux64-clang
+        - linux64-rust-android
+        - linux64-rust-size
+        - linux64-sccache
+        - linux64-node
+
 android-x86-nightly/opt:
     description: "Android 4.2 x86 Nightly"
     attributes:

testing/mozharness/configs/builds/releng_sub_android_configs/64_x86_fuzzing_debug.py

@@ -0,0 +1,6 @@
+config = {
+    'base_name': 'Android 4.2 x86 %(branch)s debug fuzzing build',
+    'stage_platform': 'android-x86-fuzzing-debug',
+    'src_mozconfig': 'mobile/android/config/mozconfigs/android-x86/debug-fuzzing',
+    'debug_build': True,
+}

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -437,6 +437,7 @@ class BuildOptionParser(object):
         'rusttests-debug': 'builds/releng_sub_%s_configs/%s_rusttests_debug.py',
         'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
         'x86-artifact': 'builds/releng_sub_%s_configs/%s_x86_artifact.py',
+        'x86-fuzzing-debug': 'builds/releng_sub_%s_configs/%s_x86_fuzzing_debug.py',
         'api-16-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_16_partner_sample1.py',
         'aarch64': 'builds/releng_sub_%s_configs/%s_aarch64.py',
         'android-test': 'builds/releng_sub_%s_configs/%s_test.py',

tools/fuzzing/faulty/Faulty.cpp

@@ -362,7 +362,7 @@ Faulty::MaybeCollectAndClosePipe(int aPipe, unsigned int aProbability)
   }
 
   if (aPipe > -1) {
-    FAULTY_LOG("Collecting pipe %d to bucket of pipes (count: %ld)",
+    FAULTY_LOG("Collecting pipe %d to bucket of pipes (count: %zu)",
                aPipe, mFds.size());
     mFds.insert(aPipe);
   }