Add chrome_public_apk and chrome_public_test_apk targets in GN.

chrome/android/chrome_apk.gyp

 # Copyright 2015 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.
 {
   'includes': [
     '../../chrome/chrome_android_paks.gypi', # Included for the list of pak resources.
     '../../build/util/version.gypi'
    ],
   'variables': {
     'chromium_code': 1,
@@ skipping 173 matching lines @@
         '<(DEPTH)/chrome/chrome.gyp:chrome_java',
         '<(DEPTH)/chrome/chrome.gyp:chrome_java_test_support',
         '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support',
         '<(DEPTH)/net/net.gyp:net_java',
         '<(DEPTH)/net/net.gyp:net_java_test_support',
         '<(DEPTH)/sync/sync.gyp:sync_java_test_support',
       ],
       'includes': [ '../../build/java.gypi' ],
     },
     {
+      # GN: //chrome/android:chrome_template_resources
       'target_name': 'chrome_template_resources',
       'type': 'none',
       'variables': {
         'jinja_inputs_base_dir': '<(chrome_java_dir)/res_template',
         'jinja_inputs': [
           '<(jinja_inputs_base_dir)/xml/searchable.xml',
           '<(jinja_inputs_base_dir)/xml/syncadapter.xml',
         ],
         'jinja_outputs_zip': '<(PRODUCT_DIR)/res.java/<(_target_name).zip',
         'jinja_variables': [
           'manifest_package=<(manifest_package)',
         ],
       },
       'all_dependent_settings': {
         'variables': {
           'additional_input_paths': ['<(jinja_outputs_zip)'],
           'dependencies_res_zip_paths': ['<(jinja_outputs_zip)'],
         },
       },
       'includes': [ '../../build/android/jinja_template.gypi' ],
     },
     {
+      # GN: //chrome/android:hosted_service_aidl
       'target_name': 'hosted_service_aidl',
       'type': 'none',
       'variables': {
         'aidl_interface_file': '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/common.aidl',
         'aidl_import_include': '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted',
       },
       'sources': [
         '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConnectionCallback.aidl',
         '<(chrome_java_dir)/src/org/chromium/chrome/browser/hosted/IBrowserConnectionService.aidl',
       ],
       'includes': [ '../../build/java_aidl.gypi' ],
     },
     {
-      # GN: TODO
+      # GN: //chrome/android:chrome_public
       'target_name': 'libchrome_public',
       'type': 'shared_library',
       'dependencies': [
         'libchrome_staging',
         '<(DEPTH)/chrome/chrome.gyp:chrome_android_core',
       ],
       'include_dirs': [
         '<(DEPTH)',
       ],
       'sources': [
@@ skipping 22 matching lines @@
           ],
         }],  # order_profiling!=0
         ['use_allocator!="none"', {
           'dependencies': [
             '<(DEPTH)/base/allocator/allocator.gyp:allocator',
           ],
         }],
       ],
     },
     {
+      # GN: //chrome/android:chrome_public_apk_manifest
       'target_name': 'chrome_public_manifest',
       'type': 'none',
       'variables': {
         'jinja_inputs': ['<(chrome_java_dir)/AndroidManifest.xml'],
         'jinja_output': '<(chrome_public_apk_manifest)',
         'jinja_variables': [
           'channel=<(android_channel)',
           'configuration_policy=<(configuration_policy)',
           'manifest_package=<(manifest_package)',
           'min_sdk_version=16',
         ],
       },
       'includes': [ '../../build/android/jinja_template.gypi' ],
     },
     {
+      # GN: //chrome/android:chrome_public_apk
       'target_name': 'chrome_public_apk',
       'type': 'none',
       'variables': {
         'android_manifest_path': '<(chrome_public_apk_manifest)',
         'apk_name': 'ChromePublic',
         'native_lib_target': 'libchrome_public',
         'java_in_dir': '<(chrome_java_dir)',
         'conditions': [
           # Only attempt loading the library from the APK for 64 bit devices
           # until the number of 32 bit devices which don't support this
@@ skipping 65 matching lines @@
         '<(DEPTH)/components/components.gyp:web_contents_delegate_android_java',
         '<(DEPTH)/content/content_shell_and_tests.gyp:content_java_test_support',
         '<(DEPTH)/net/net.gyp:net_java',
         '<(DEPTH)/net/net.gyp:net_java_test_support',
         '<(DEPTH)/sync/sync.gyp:sync_java_test_support',
         '<(DEPTH)/third_party/android_tools/android_tools.gyp:android_support_v7_appcompat_javalib',
       ],
       'includes': [ '../../build/java.gypi' ],
     },
     {
-      # GN: None. This will most likely be merged with chrome_shell before GN is
-      # done.
+      # GN: //chrome/android:chrome_public_test_apk_manifest
       'target_name': 'chrome_public_test_apk_manifest',
       'type': 'none',
       'variables': {
         'jinja_inputs': ['<(chrome_java_tests_dir)/AndroidManifest.xml'],
         'jinja_output': '<(chrome_public_test_apk_manifest)',
         'jinja_variables': [
           'manifest_package=<(manifest_package)',
         ],
       },
       'includes': [ '../../build/android/jinja_template.gypi' ],
     },
     {
-      # GN: None. This will most likely be merged with chrome_shell before GN is
-      # done.
+      # GN: //chrome/android:chrome_public_test_apk
       'target_name': 'chrome_public_test_apk',
       'type': 'none',
       'dependencies': [
         'chrome_shared_test_java',
         'chrome_public_apk_java',
       ],
       'variables': {
         'android_manifest_path': '<(chrome_public_test_apk_manifest)',
         'package_name': 'chrome_public_test',
         'java_in_dir': '<(chrome_java_tests_dir)',
         'java_in_dir_suffix': '/src_dummy',
         'apk_name': 'ChromePublicTest',
         'is_test_apk': 1,
       },
       'includes': [ '../../build/java_apk.gypi' ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: