Update build/all_android.gyp from downstream.

build/all_android.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This is all.gyp file for Android to prevent breakage in Android and other
 # platform; It will be churning a lot in the short term and eventually be merged
 # into all.gyp.
 
 {
+  'variables': {
+    # A hook that can be overridden in other repositories to add additional
+    # compilation targets to 'All'
+    'android_app_targets%': [],
+  },
   'targets': [
     {
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
         '../content/content.gyp:content_shell_apk',
+        '<@(android_app_targets)',
         'android_builder_tests',
       ],
     }, # target_name: All
     {
       # The current list of tests for android.  This is temporary
       # until the full set supported.  If adding a new test here,
       # please also add it to build/android/run_tests.py, else the
       # test is not run.
       #
       # WARNING:
       # Do not add targets here without communicating the implications
       # on tryserver triggers and load.  Discuss with jrg please.
       'target_name': 'android_builder_tests',
       'type': 'none',
       'dependencies': [
+        '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests',
         '../base/base.gyp:base_unittests',
         '../chrome/chrome.gyp:unit_tests',
         '../content/content.gyp:content_shell_test_apk',
         '../content/content.gyp:content_unittests',
         '../gpu/gpu.gyp:gpu_unittests',
         '../ipc/ipc.gyp:ipc_tests',
+        '../media/media.gyp:media_unittests',
         '../net/net.gyp:net_unittests',
         '../sql/sql.gyp:sql_unittests',
         '../sync/sync.gyp:sync_unit_tests',
         '../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
         '../tools/android/device_stats_monitor/device_stats_monitor.gyp:device_stats_monitor',
         '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
         '../tools/android/forwarder/forwarder.gyp:forwarder',
         '../tools/android/md5sum/md5sum.gyp:md5sum',
         '../ui/ui.gyp:ui_unittests',
         # From here down: not added to run_tests.py yet.
         '../jingle/jingle.gyp:jingle_unittests',
-        '../media/media.gyp:media_unittests',
         # Required by ui_unittests.
         # TODO(wangxianzhu): It'd better let ui_unittests depend on it, but
         # this would cause circular gyp dependency which needs refactoring the
         # gyps to resolve.
         '../chrome/chrome_resources.gyp:packed_resources',
       ],
       'conditions': [
+        ['linux_breakpad==1', {
+          'dependencies': [
+            '../breakpad/breakpad.gyp:breakpad_unittests',
+          ],
+        }],
         ['"<(gtest_target_type)"=="shared_library"', {
           'dependencies': [
             # The first item is simply the template.  We add as a dep
             # to make sure it builds in ungenerated form.  TODO(jrg):
             # once stable, transition to a test-only (optional)
             # target.
             '../testing/android/native_test.gyp:native_test_apk',
             # Unit test bundles packaged as an apk.
             '../base/base.gyp:base_unittests_apk',
+            '../chrome/chrome.gyp:unit_tests_apk',
             '../content/content.gyp:content_unittests_apk',
-            '../chrome/chrome.gyp:unit_tests_apk',
             '../gpu/gpu.gyp:gpu_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
             '../media/media.gyp:media_unittests_apk',
             '../net/net.gyp:net_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
             '../sync/sync.gyp:sync_unit_tests_apk',
             '../ui/ui.gyp:ui_unittests_apk',
           ],
         }]
       ],
@@ skipping 14 matching lines @@
       # In-progress targets that are expected to fail and are NOT run
       # on any bot.
       'target_name': 'android_in_progress',
       'type': 'none',
       'dependencies': [
         '../content/content.gyp:content_browsertests',
       ],
     },
   ],  # targets
 }