Re-enable about:flags on Android

chrome/chrome_browser.gypi

 # Copyright 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 49 matching lines @@
       'export_dependent_settings': [
         '../sync/sync.gyp:sync_notifier',
       ],
       'sources': [
         # All .cc, .h, .m, and .mm files under browser except for:
         # * tests and mocks.
         # * code below browser/chromeos
         # * code below browser/extensions
         'browser/about_flags.cc',
         'browser/about_flags.h',
-        'browser/about_flags_android.cc',
         'browser/accessibility/accessibility_extension_api_constants.cc',
         'browser/accessibility/accessibility_extension_api_constants.h',
         'browser/accessibility/accessibility_events.cc',
         'browser/accessibility/accessibility_events.h',
         'browser/accessibility/invert_bubble_prefs.cc',
         'browser/accessibility/invert_bubble_prefs.h',
         'browser/alternate_nav_url_fetcher.cc',
         'browser/alternate_nav_url_fetcher.h',
         'browser/android/chrome_jni_registrar.cc',
         'browser/android/chrome_jni_registrar.h',
@@ skipping 886 matching lines @@
         'browser/jankometer.cc',
         'browser/jankometer.h',
         'browser/jankometer_android.cc',
         'browser/jankometer_mac.cc',
         'browser/jumplist_win.cc',
         'browser/jumplist_win.h',
         'browser/language_usage_metrics.cc',
         'browser/language_usage_metrics.h',
         'browser/lifetime/application_lifetime.cc',
         'browser/lifetime/application_lifetime.h',
+        'browser/lifetime/application_lifetime_android.cc',
+        'browser/lifetime/application_lifetime_android.h',
         'browser/lifetime/application_lifetime_aura.cc',
         'browser/lifetime/application_lifetime_gtk.cc',
         'browser/lifetime/application_lifetime_mac.mm',
         'browser/lifetime/application_lifetime_stub.cc',
         'browser/lifetime/application_lifetime_win.cc',
         'browser/mac/dock.h',
         'browser/mac/dock.mm',
         'browser/mac/install_from_dmg.h',
         'browser/mac/install_from_dmg.mm',
         'browser/mac/keychain_reauthorize.h',
@@ skipping 1771 matching lines @@
             'browser/ssl/ssl_add_certificate_android.cc',
             'browser/web_resource/notification_promo_mobile_ntp.cc',
             'browser/web_resource/notification_promo_mobile_ntp.h',
           ],
           'sources!': [
             # Bookmark export/import are handled via the BookmarkColumns
             # ContentProvider.
             'browser/bookmarks/bookmark_html_writer.cc',
             'browser/ssl/ssl_add_certificate.cc',
 
-            # about:flags is unsupported.
-            'browser/about_flags.cc',
-            'browser/about_flags.h',
-
             'browser/jankometer.cc',
             'browser/sync/sync_global_error.cc',
             'browser/sync/sync_global_error.h',
 
-            # There's no Browser/BrowserList on Android.
             'browser/download/download_crx_util.cc',
-            'browser/lifetime/application_lifetime_stub.cc',
             'browser/net/gaia/gaia_oauth_fetcher.cc',
             'browser/omnibox_search_hint.cc',
             'browser/page_cycler/page_cycler.cc',
             'browser/page_cycler/page_cycler.h',
             'browser/sessions/persistent_tab_restore_service.cc',
             'browser/sessions/persistent_tab_restore_service.h',
             'browser/sessions/session_backend.cc',
             'browser/sessions/session_backend.h',
             'browser/tab_contents/background_contents.cc',
             'browser/tab_contents/background_contents.h',
             'browser/tab_contents/render_view_context_menu.cc',
             'browser/tab_contents/render_view_context_menu.h',
             'browser/tab_contents/render_view_context_menu_observer.cc',
             'browser/tab_contents/render_view_context_menu_observer.h',
             'browser/tab_contents/spellchecker_submenu_observer.h',
             'browser/tab_contents/spellchecker_submenu_observer_hunspell.cc',
             'browser/tab_contents/spelling_bubble_model.cc',
             'browser/tab_contents/spelling_bubble_model.h',
             'browser/tab_contents/spelling_menu_observer.cc',
             'browser/tab_contents/spelling_menu_observer.h',
-            'browser/upgrade_detector.cc',
-            'browser/upgrade_detector.h',
             'browser/upgrade_detector_impl.cc',
             'browser/upgrade_detector_impl.h',
 
             # Not used by Android
             'browser/chrome_browser_main_posix.cc',
             'browser/chrome_browser_main_posix.h',
             'browser/process_singleton.cc',
           ],
           'sources/': [
             ['exclude', '^browser/captive_portal/'],
             ['exclude', '^browser/chrome_to_mobile'],
             ['exclude', '^browser/first_run/'],
             ['include', '^browser/first_run/first_run.cc'], # For ctor/dtor of a struct.
             ['exclude', '^browser/importer/'],
-            ['exclude', '^browser/lifetime/'],
             ['exclude', '^browser/managed_mode/'],
             ['exclude', '^browser/service/'],
             ['exclude', '^browser/speech/'],
             ['exclude', '^browser/sync/glue/app_'],
             ['exclude', '^browser/sync/glue/extension_'],
             ['exclude', '^browser/sync/glue/theme_'],
             ['exclude', '^browser/usb/'],
           ],
         }],
         ['OS=="mac"', {
@@ skipping 286 matching lines @@
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
   'conditions': [
     ['OS=="android"', {
       'targets': [
         {
           'target_name': 'chrome_browser_jni_headers',
           'type': 'none',
           'sources': [
+            'android/java/src/org/chromium/chrome/browser/ApplicationLifetime.java',
             'android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupGlue.java',
             'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java',
             'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
             'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java',
             'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',
             'android/java/src/org/chromium/chrome/browser/DevToolsServer.java',
             'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
             'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
             'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
             'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
             'android/java/src/org/chromium/chrome/browser/TabBase.java',
             'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java',
           ],
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }