Update To 11.40.268.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 0419d60..e2f55b2 100644 (file)
--- a/src/android_webview/android_webview_tests.gypi
+++ b/src/android_webview/android_webview_tests.gypi
@@ -7,9 +7,10 @@
       'target_name': 'android_webview_apk',
       'type': 'none',
       'dependencies': [
-        'libwebviewchromium',
+        'libstandalonelibwebviewchromium',
         'android_webview_java',
         'android_webview_pak',
+        'libdrawgl',
       ],
       'variables': {
         'apk_name': 'AndroidWebView',
@@ -17,13 +18,17 @@
         'native_lib_target': 'libstandalonelibwebviewchromium',
         'resource_dir': 'test/shell/res',
         'extensions_to_not_compress': 'pak',
+        'extra_native_libs': ['<(SHARED_LIB_DIR)/libdrawgl.>(android_product_extension)'],
         'additional_input_paths': [
-          '<(PRODUCT_DIR)/android_webview_apk/assets/webviewchromium.pak',
-          '<(PRODUCT_DIR)/android_webview_apk/assets/en-US.pak',
+          '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
+          '<(PRODUCT_DIR)/android_webview_assets/en-US.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.js',
           '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_test.html',
+          '<(PRODUCT_DIR)/android_webview_apk/assets/full_screen_video_inside_div_test.html',
+          '<(PRODUCT_DIR)/android_webview_apk/assets/video.mp4',
         ],
         'conditions': [
           ['icu_use_data_file_flag==1', {
@@ -31,23 +36,40 @@
               '<(PRODUCT_DIR)/icudtl.dat',
             ],
           }],
+          ['v8_use_external_startup_data==1', {
+            'additional_input_paths': [
+              '<(PRODUCT_DIR)/natives_blob.bin',
+              '<(PRODUCT_DIR)/snapshot_blob.bin',
+            ],
+          }],
         ],
       },
       'copies': [
         {
           'destination': '<(PRODUCT_DIR)/android_webview_apk/assets',
           'files': [
+            '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
+            '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
             '<(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.js',
             '<(java_in_dir)/assets/full_screen_video_test.html',
+            '<(java_in_dir)/assets/full_screen_video_inside_div_test.html',
+            '<(java_in_dir)/assets/video.mp4',
           ],
          'conditions': [
             ['icu_use_data_file_flag==1', {
               'files': [
                 '<(PRODUCT_DIR)/icudtl.dat',
               ],
-           }],
+            }],
+            ['v8_use_external_startup_data==1', {
+              'files': [
+                '<(PRODUCT_DIR)/natives_blob.bin',
+                '<(PRODUCT_DIR)/snapshot_blob.bin',
+              ],
+            }],
           ],
         },
       ],
@@ -102,7 +124,6 @@
       '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',
@@ -162,5 +183,23 @@
       ],
       'includes': [ '../build/apk_test.gypi' ],
     },
+    {
+      'target_name': 'libdrawgl',
+      'type': 'shared_library',
+      # Do not depend on any other component here, since this target
+      # builds a separate shared library!
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+          '../android_webview/test/shell/src/draw_gl/draw_gl.cc',
+      ],
+    },
+    {
+      'target_name': 'libstandalonelibwebviewchromium',
+      'includes': [
+        'libwebviewchromium.gypi',
+      ],
+    },
   ],
 }