Upstream version 10.39.225.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 18fcbe1..ff7f2af 100644 (file)
--- a/src/android_webview/android_webview_tests.gypi
+++ b/src/android_webview/android_webview_tests.gypi
@@ -7,18 +7,23 @@
       'target_name': 'android_webview_apk',
       'type': 'none',
       'dependencies': [
-        'libwebviewchromium',
+        'libstandalonelibwebviewchromium',
         'android_webview_java',
         'android_webview_pak',
+        'libdrawgl',
       ],
       'variables': {
         'apk_name': 'AndroidWebView',
         'java_in_dir': 'test/shell',
         '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_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_test.html',
         ],
@@ -34,8 +39,11 @@
         {
           '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_test.html',
           ],
          'conditions': [
@@ -96,11 +104,17 @@
         '<(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/permission/media_access_permission_request_unittest.cc',
+        'native/permission/permission_request_handler_unittest.cc',
         'native/state_serializer_unittest.cc',
       ],
     },
@@ -122,10 +136,10 @@
       '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',
-        'jni_generator_ptr_type': 'long',
       },
       'includes': [ '../build/jni_generator.gypi' ],
     },
@@ -138,9 +152,37 @@
       ],
       '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' ],
     },
+    {
+      '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',
+      ],
+    },
   ],
 }