Check library version and handle library load errors

build/java_apk.gypi

Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index 2485ed59d829f6f98c5d8b5d0a6301e12b4a2f27..51b21148f41d0dc71ee826ed3c7acf43b4dc7baf 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -61,7 +61,7 @@
     'additional_src_dirs': [],
     'generated_src_dirs': [],
     'app_manifest_version_name%': '<(android_app_version_name)',
-    'app_manifest_version_code%': '<(android_app_version_code)',

[Yaron, 2013/11/16 00:10:26]

I think this is breaking some people. remoting/remoting.gyp sets this veariable.
Also, can we remove the default value of it from build/common.gypi?

[aberent, 2013/11/18 15:11:37]

This change was a mistake (left over from some local testing I was doing).
Thanks for spotting it. Reverted

+    'app_manifest_version_code%': '1',
     'proguard_enabled%': 'false',
     'proguard_flags_paths%': ['<(DEPTH)/build/android/empty_proguard.flags'],
     'jar_name': 'chromium_apk_<(_target_name).jar',
@@ -89,6 +89,7 @@
     'native_libraries_java_stamp': '<(intermediate_dir)/native_libraries_java.stamp',
     'native_libraries_template_data_dir': '<(intermediate_dir)/native_libraries/',
     'native_libraries_template_data_file': '<(native_libraries_template_data_dir)/native_libraries_array.h',
+    'native_libraries_template_version_file': '<(native_libraries_template_data_dir)/native_libraries_version.h',
     'native_libraries_template_data_stamp': '<(intermediate_dir)/native_libraries_template_data.stamp',
     'compile_stamp': '<(intermediate_dir)/compile.stamp',
     'instr_stamp': '<(intermediate_dir)/instr.stamp',
@@ -120,6 +121,7 @@
     'variables': {
       'variables': {
         'native_lib_target%': '',
+        'native_lib_version_name%': '',
         'use_content_linker%': 0,
         'enable_content_linker_tests%': 0,
         'is_test_apk%': 0,
@@ -143,6 +145,7 @@
       ],
     },
     'native_lib_target%': '',
+    'native_lib_version_name%': '',
     'use_content_linker%': 0,
     'enable_content_linker_tests%': 0,
     'emma_instrument': '<(emma_instrument)',
@@ -240,11 +243,15 @@
           ],
           'outputs': [
             '<(native_libraries_template_data_stamp)',
+#            '<(native_libraries_template_data_file)',

[Yaron, 2013/11/16 00:10:26]

Remove these

[aberent, 2013/11/18 15:11:37]

Done.

[aberent, 2013/11/18 18:26:52]

Actually I have put these back in properly (not as comments), made the creation
of NativeLibraries.java dependent on these, and taken out the now unnecessary
stamp file. Without these as outputs they were sometimes failing to rebuild
(possibly only when I had done something strange to my local output directory),
and this seems more correct since the function of this step is to produce these
files.

+#            '<(native_libraries_template_version_file)',
           ],
           'action': [
             'python', '<(DEPTH)/build/android/gyp/create_native_libraries_header.py',
             '--ordered-libraries=<(ordered_libraries_file)',
-            '--output=<(native_libraries_template_data_file)',
+            '--version-name=<(native_lib_version_name)',
+            '--array-output=<(native_libraries_template_data_file)',

[Yaron, 2013/11/16 00:10:26]

What is "array-output"? Maybe rename native-libraries-list?

[aberent, 2013/11/18 15:11:37]

Done.

+            '--version-output=<(native_libraries_template_version_file)',
             '--stamp=<(native_libraries_template_data_stamp)',
           ],
         },