[Android] Add an option to skip v14 resource verification.

build/java.gypi

Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 730fa2222a7417c1684ea6f23a40e17b058d4cb7..716eb34beacc735d95e9fa43c756911a812433f8 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -69,6 +69,7 @@
     'has_java_resources%': 0,
     'res_extra_dirs': [],
     'res_extra_files': [],
+    'res_v14_skip%': 0,
     'res_v14_verify_only%': 0,
     'resource_input_paths': ['>@(res_extra_files)'],
     'intermediate_dir': '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)',
@@ -157,6 +158,9 @@
             'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths))',
             'process_resources_options': [],
             'conditions': [
+              ['res_v14_skip == 1', {
+                'process_resources_options': ['--v14-skip']
+              }],
               ['res_v14_verify_only == 1', {
                 'process_resources_options': ['--v14-verify-only']

[aurimas (slooooooooow), 2015/05/13 17:21:41]

Can we delete v14-verify-only? It is only used in android_tools and in
deviceextras downstream and both can be v14-skip.

[Kibeom Kim (inactive), 2015/05/13 17:33:04]

Yeah I think it makes sense. But anyways, I guess it should be done as a
separate CL because the repo is different and we need to roll.

               }],