Enable icu_use_data_file_flag on Android

content/content_tests.gypi

Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 0e436297f850e9ae4b424094f203193d6b78fdb0..973a225ca92b0ae4708805bb1a3a0de6c9f36e5e 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1388,7 +1388,26 @@
             'native_lib_target': 'libcontent_browsertests',
             'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
+            'conditions': [
+              ['icu_use_data_file_flag==1', {
+                'additional_input_paths': [
+                  '<(PRODUCT_DIR)/icudtl.dat',
+                ],
+              }],
+            ],
           },
+          'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'copies': [
+                {
+                  'destination': '<(asset_location)',
+                  'files': [
+                    '<(PRODUCT_DIR)/icudtl.dat',
+                  ],
+                },
+              ],
+            }],
+          ],            
           'includes': [ '../build/java_apk.gypi' ],
         },
         {
@@ -1408,7 +1427,26 @@
             'asset_location': '<(PRODUCT_DIR)/content_shell/assets',
             'use_chromium_linker': '1',
             'enable_chromium_linker_tests': '1',
+            'conditions': [
+              ['icu_use_data_file_flag==1', {
+                'additional_input_paths': [
+                  '<(PRODUCT_DIR)/icudtl.dat',
+                ],
+              }],
+            ],
           },
+          'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'copies': [
+                {
+                  'destination': '<(asset_location)',
+                  'files': [
+                    '<(PRODUCT_DIR)/icudtl.dat',
+                  ],
+                },
+              ],
+            }],
+          ],            
           'includes': [ '../build/java_apk.gypi' ],

[jungshik at Google, 2014/02/11 19:55:06]

With this PS, content_shell now works. However, I'm not so happy about having to

duplicate the above in 3 different places (twice in this file and once in
content_shell.gypi. Moreover, there are other targets that include java_apk.gypi
that may need the same treatment. 

So, I'm thinking of adding a new variable to java_apk.gypi that controls whether
or not to copy and add icudtl.dat to assets in apk. The default value perhaps
should be 1. 

[cjhopman, 2014/02/11 20:55:00]

Hm. I think adding something to java_apk.gypi to make this simpler would be
good, but I would prefer something more general. For example, you could add an
additional_asset_paths variable (or additional_apk_asset_paths or something) to
java_apk.gypi and then have that deal with the copies step. Then you would only
need the conditions block in the variables section. Also, if there is some
native library part that corresponds to this .dat file (i.e. any apk with that
native library would want that .dat) you could use an all_dependent_settings
block there and you wouldn't even need to change the apk targets.

[bulach, 2014/02/12 10:53:19]

+1 for encapsulating within java_apk.gypi and +1 for cjhopman's suggestion on
making it generic. :)

         },
         {