Add native libraries to gn apks

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index c7ef1591b46ed89dd043666b0369bb66808fc393..1a3d0ef78c156f13b336049d435392d3b771a37f 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -258,26 +258,6 @@
           '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': [
@@ -325,8 +305,7 @@
           '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': [
@@ -334,10 +313,12 @@
           ],
           '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)',
           ],
         },
@@ -450,7 +431,7 @@
               '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)',