commit ea28dded3433943c70de80cbe0b3fa05f1483b1a
author Tarun Nainani <tnainani@codeaurora.org> Wed Aug 27 17:25:09 2014 -0700
committer Tarun Nainani <tnainani@codeaurora.org> Sat Sep 13 15:05:28 2014 -0700
tree bd3474b8deda27b644ead89a72c5267f6d64723a
parent 0989b45c12b64b28750c9df1389c6003aa0d1d65

Make SWEAB work with M38 branch

Change-Id: I01cee135afdcde2f7dab53a9f45c0413a6cb813b

swe_android_browser.gypi

diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index 0c9c485..99ca387 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -6,9 +6,6 @@
       'dependencies': [
         'swe_engine_java',
         'android-support-v13',
-        'fast_webview_java',
-        '<@(libnetxt_dependencies)',
-        '<@(libsweadrenoext_dependencies)',
       ],
       'variables': {
         'apk_name': 'SWE_AndroidBrowser',
@@ -20,7 +17,13 @@
         'assets_dir': '../../swe/browser/assets',
         'native_lib_target': 'libswewebviewchromium',
         'additional_input_paths': ['<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak'],
-        'additional_native_libs': ['<@(libnetxt_native_libs)', '<@(libsweadrenoext_native_libs)'],
+        'conditions': [
+          ['icu_use_data_file_flag==1', {
+            'additional_input_paths': [
+              '<(PRODUCT_DIR)/icudtl.dat',
+            ],
+          }],
+        ],
         'override_package_name': 'com.android.swe.browser',
         'android_manifest_path': '../../swe/browser/AndroidManifest.xml',
         'additional_src_dirs': ['<(DEPTH)/swe/browser/src_standalone/com/android/browser'],
@@ -31,6 +34,13 @@
               'files': [
                 '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak'
               ],
+              'conditions': [
+                ['icu_use_data_file_flag==1', {
+                  'files': [
+                    '<(PRODUCT_DIR)/icudtl.dat',
+                ],
+                }],
+              ],
         },
         {
               'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/assets/wml',