Make the build control what library(/ies) to load

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index bfe8d9c1c3f39008ef7ba0a0199632104776a658..0a3632afdc1dd84c222310f39056a09239e84b54 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -73,6 +73,15 @@
     'intermediate_dir': '<(PRODUCT_DIR)/<(_target_name)',
     'asset_location%': '<(intermediate_dir)/assets',
     'codegen_stamp': '<(intermediate_dir)/codegen.stamp',
+    'compile_input_paths': [ ],
+    'ordered_libraries_path': '<(intermediate_dir)/native_libraries.json',

[Yaron, 2013/03/29 20:37:32]

Nit: how bout ordered_libraries_file? This is a path to a specific file, right?
It'll still get relativized

[cjhopman, 2013/03/29 22:29:31]

Done.

+    'native_libraries_template': '<(DEPTH)/content/public/android/java/templates/NativeLibraries.template',

[Yaron, 2013/03/29 20:37:32]

build/ shouldn't refer to content. Also, we'll probably need this for running
unit tests. Add a TODO and file bug to move library loader. 

[cjhopman, 2013/03/29 22:29:31]

Done.

+    'native_libraries_java_dir': '<(intermediate_dir)/native_libraries_java/',
+    'native_libraries_java_path': '<(intermediate_dir)/native_libraries_java/NativeLibraries.java',

[Yaron, 2013/03/29 20:37:32]

use |naive_libraries_java_dir|

[cjhopman, 2013/03/29 22:29:31]

Done.

+    'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp',
+    'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/',
+    'native_libraries_template_data_path': '<(native_libraries_template_data_dir)/native_libraries_array.h',
+    'native_libraries_template_data_stamp': '<(intermediate_dir)/native_libraries_template_data.stamp',
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'jar_stamp': '<(intermediate_dir)/jar.stamp',
     'obfuscate_stamp': '<(intermediate_dir)/obfuscate.stamp',
@@ -134,6 +143,69 @@
         'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'],
       },
     }],
+    ['native_libs_paths != []', {
+      'variables': {
+        'compile_input_paths': [ '<(native_libraries_java_stamp)' ],
+        'generated_src_dirs': [ '<(native_libraries_java_dir)' ],
+      },
+      'actions': [
+        {
+          'action_name': 'ordered_libraries_<(_target_name)',
+          'message': 'Writing dependency ordered libraries for <(_target_name).',
+          'inputs': [
+            '<(DEPTH)/build/android/pylib/build_utils.py',
+            '<(DEPTH)/build/android/write_ordered_libraries.py',
+            '<@(native_libs_paths)',
+          ],
+          'outputs': [
+            '<(ordered_libraries_path)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/build/android/write_ordered_libraries.py',
+            '--input-libraries=<(native_libs_paths)',
+            '--output=<(ordered_libraries_path)',
+          ],
+        },
+        {
+          'action_name': 'native_libraries_template_data_<(_target_name)',
+          'message': 'Creating native_libraries_list.h for <(_target_name).',
+          'inputs': [
+            '<(DEPTH)/build/android/pylib/build_utils.py',
+            '<(DEPTH)/build/android/create_native_libraries_header.py',
+            '<(ordered_libraries_path)',
+          ],
+          'outputs': [
+            '<(native_libraries_template_data_stamp)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/build/android/create_native_libraries_header.py',
+            '--ordered-libraries=<(ordered_libraries_path)',
+            '--output=<(native_libraries_template_data_path)',
+            '--stamp=<(native_libraries_template_data_stamp)',
+          ],
+        },
+        {
+          'action_name': 'native_libraries_<(_target_name)',
+          'message': 'Creating NativeLibraries.java for <(_target_name).',
+          'inputs': [
+            '<(DEPTH)/build/android/pylib/build_utils.py',
+            '<(DEPTH)/build/android/gcc_preprocess.py',
+            '<(native_libraries_template_data_stamp)',
+            '<(native_libraries_template)',
+          ],
+          'outputs': [
+            '<(native_libraries_java_stamp)',
+          ],
+          'action': [
+            'python', '<(DEPTH)/build/android/gcc_preprocess.py',
+            '--include-path=<(native_libraries_template_data_dir)',
+            '--output=<(native_libraries_java_path)',
+            '--template=<(native_libraries_template)',
+            '--stamp=<(native_libraries_java_stamp)',
+          ],
+        },
+      ],
+    }], # native_libs_paths != []
     ['java_strings_grd != ""', {
       'variables': {
         'res_grit_dir': '<(SHARED_INTERMEDIATE_DIR)/<(package_name)_apk/res_grit',
@@ -223,6 +295,7 @@
         '>!@(find >(java_in_dir) >(additional_src_dirs) -name "*.java")',
         '>@(input_jars_paths)',
         '<(codegen_stamp)',
+        '>@(compile_input_paths)',
       ],
       'outputs': [
         '<(compile_stamp)',