Upstream version 9.37.197.0

[platform/framework/web/crosswalk.git] / src / android_webview / android_webview_tests.gypi

diff --git a/src/android_webview/android_webview_tests.gypi b/src/android_webview/android_webview_tests.gypi
index ffbd8e5..1639e60 100644 (file)
--- a/src/android_webview/android_webview_tests.gypi
+++ b/src/android_webview/android_webview_tests.gypi
@@ -19,9 +19,17 @@
         'additional_input_paths': [
           '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
           '<(PRODUCT_DIR)/android_webview_apk/assets/asset_file.html',
+          '<(PRODUCT_DIR)/android_webview_apk/assets/cookie_test.html',
           '<(PRODUCT_DIR)/android_webview_apk/assets/asset_icon.png',
           '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
         ],
+        'conditions': [
+          ['icu_use_data_file_flag==1', {
+            'additional_input_paths': [
+              '<(PRODUCT_DIR)/icudtl.dat',
+            ],
+          }],
+        ],
       },
       'copies': [
         {
@@ -29,8 +37,16 @@
           'files': [
             '<(java_in_dir)/assets/asset_file.html',
             '<(java_in_dir)/assets/asset_icon.png',
+            '<(java_in_dir)/assets/cookie_test.html',
             '<(java_in_dir)/assets/full_screen_video_test.html',
           ],
+         'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'files': [
+                '<(PRODUCT_DIR)/icudtl.dat',
+              ],
+           }],
+          ],
         },
       ],
       'includes': [ '../build/java_apk.gypi' ],
@@ -38,7 +54,7 @@
     {
       # android_webview_apk creates a .jar as a side effect. Any java
       # targets that need that .jar in their classpath should depend on this
-      # target. For more details see the chromium_testshell_java target.
+      # target. For more details see the chrome_shell_apk_java target.
       'target_name': 'android_webview_apk_java',
       'type': 'none',
       'dependencies': [
@@ -72,8 +88,9 @@
         '../testing/android/native_test.gyp:native_test_native_code',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../ui/ui.gyp:ui_jni_headers',
+        '../ui/base/ui_base.gyp:ui_base_jni_headers',
         'android_webview_common',
+        'android_webview_unittests_jni',
       ],
       'include_dirs': [
         '..',
@@ -81,12 +98,18 @@
         '<(SHARED_INTERMEDIATE_DIR)/android_webview_unittests',
       ],
       'sources': [
+        'browser/aw_static_cookie_policy_unittest.cc',
         'browser/aw_form_database_service_unittest.cc',
+        'browser/global_tile_manager_unittest.cc',
         'browser/net/android_stream_reader_url_request_job_unittest.cc',
         'browser/net/input_stream_reader_unittest.cc',
         'lib/main/webview_tests.cc',
+        'native/aw_contents_client_bridge_unittest.cc',
+        'native/aw_media_url_interceptor_unittest.cc',
         'native/input_stream_unittest.cc',
-        'native/state_serializer_unittests.cc',
+        'native/permission/media_access_permission_request_unittest.cc',
+        'native/permission/permission_request_handler_unittest.cc',
+        'native/state_serializer_unittest.cc',
       ],
     },
     {
@@ -107,6 +130,7 @@
       'type': 'none',
       'sources': [
           '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/InputStreamUnittest.java',
+          '../android_webview/unittestjava/src/org/chromium/android_webview/unittest/MockAwContentsClientBridge.java',
       ],
       'variables': {
         'jni_gen_package': 'android_webview_unittests',
@@ -119,12 +143,21 @@
       'dependencies': [
         'android_webview_unittest_java',
         'android_webview_unittests',
-        'android_webview_unittests_jni',
       ],
       'variables': {
         'test_suite_name': 'android_webview_unittests',
-        'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)android_webview_unittests<(SHARED_LIB_SUFFIX)',
+        'additional_input_paths': [
+          '<(PRODUCT_DIR)/android_webview_unittests_apk/assets/asset_file.ogg',
+        ],
       },
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/android_webview_unittests_apk/assets',
+          'files': [
+            'test/unittest/assets/asset_file.ogg',
+          ],
+        },
+      ],
       'includes': [ '../build/apk_test.gypi' ],
     },
   ],