Add native libraries to gn apks

build/java_apk.gypi

 # 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 file is meant to be included into a target to provide a rule
 # to build Android APKs in a consistent manner.
 #
 # To use this, create a gyp target with the following form:
 # {
 #   'target_name': 'my_package_apk',
@@ skipping 239 matching lines @@
             ],
             'input_libraries': [
               '<@(native_libs_paths)',
               '<@(extra_native_libs)',
               '<@(linker_input_libraries)',
             ],
           },
           'includes': ['../build/android/write_ordered_libraries.gypi'],
         },
         {
-          'action_name': 'native_libraries_template_data_<(_target_name)',
-          'message': 'Creating native_libraries_list.h for <(_target_name)',
-          'inputs': [
-            '<(DEPTH)/build/android/gyp/util/build_utils.py',
-            '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
-            '<(ordered_libraries_file)',
-          ],
-          'outputs': [
-            '<(native_libraries_template_data_file)',
-            '<(native_libraries_template_version_file)',
-          ],
-          'action': [
-            'python', '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
-            '--ordered-libraries=<(ordered_libraries_file)',
-            '--version-name=<(native_lib_version_name)',
-            '--native-library-list=<(native_libraries_template_data_file)',
-            '--version-output=<(native_libraries_template_version_file)',
-          ],
-        },
-        {
           'action_name': 'native_libraries_<(_target_name)',
           'variables': {
             'conditions': [
               ['use_chromium_linker == 1', {
                 'variables': {
                   'linker_gcc_preprocess_defines': [
                     '--defines', 'ENABLE_CHROMIUM_LINKER',
                   ],
                 }
               }, {
@@ skipping 27 matching lines @@
             'gcc_preprocess_defines': [
               '<@(linker_load_from_zip_file_preprocess_defines)',
               '<@(linker_gcc_preprocess_defines)',
               '<@(linker_tests_gcc_preprocess_defines)',
             ],
           },
           'message': 'Creating NativeLibraries.java for <(_target_name)',
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
             '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
-            '<(native_libraries_template_data_file)',
-            '<(native_libraries_template_version_file)',
+            '<(ordered_libraries_file)',
             '<(native_libraries_template)',
           ],
           'outputs': [
             '<(native_libraries_java_stamp)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/gcc_preprocess.py',
-            '--include-path=<(native_libraries_template_data_dir)',
+            '--include-path=',
             '--output=<(native_libraries_java_file)',
             '--template=<(native_libraries_template)',
             '--stamp=<(native_libraries_java_stamp)',
+            '--defines', 'NATIVE_LIBRARIES_LIST=@FileArg(<(ordered_libraries_file):java_libraries_list)',
+            '--defines', 'NATIVE_LIBRARIES_VERSION_NUMBER="<(native_lib_version_name)"',
             '<@(gcc_preprocess_defines)',
           ],
         },
         {
           'action_name': 'strip_native_libraries',
           'variables': {
             'ordered_libraries_file%': '<(ordered_libraries_file)',
             'stripped_libraries_dir%': '<(stripped_libraries_dir)',
             'input_paths': [
               '<@(native_libs_paths)',
@@ skipping 92 matching lines @@
                 '<(apk_install_record)',
                 '<(build_device_config_path)',
                 '<(ordered_libraries_file)',
               ],
               'outputs': [
                 '<(link_stamp)'
               ],
               'action': [
                 'python', '<(DEPTH)/build/android/gyp/create_device_library_links.py',
                 '--build-device-configuration=<(build_device_config_path)',
-                '--libraries-json=<(ordered_libraries_file)',
+                '--libraries=@FileArg(<(ordered_libraries_file):libraries)',
                 '--script-host-path=<(symlink_script_host_path)',
                 '--script-device-path=<(symlink_script_device_path)',
                 '--target-dir=<(device_library_dir)',
                 '--apk=<(incomplete_apk_path)',
                 '--stamp=<(link_stamp)',
                 '--configuration-name=<(CONFIGURATION_NAME)',
               ],
             },
           ],
           'conditions': [
@@ skipping 435 matching lines @@
         '-DEMMA_INSTRUMENT=<(emma_instrument)',
         '-DEMMA_DEVICE_JAR=<(emma_device_jar)',
 
         '-Dbasedir=.',
         '-buildfile',
         '<(DEPTH)/build/android/ant/apk-package.xml',
       ]
     },
   ],
 }