projects / platform / framework / web / crosswalk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Upstream version 11.39.244.0
[platform/framework/web/crosswalk.git] / src / xwalk / xwalk_android_tests.gypi
diff --git a/src/xwalk/xwalk_android_tests.gypi b/src/xwalk/xwalk_android_tests.gypi
index ca26d69..8b78398 100644 (file)
--- a/src/xwalk/xwalk_android_tests.gypi
+++ b/src/xwalk/xwalk_android_tests.gypi
@@ -18,8 +18,7 @@
       'type': 'none',
       'dependencies': [
         'xwalk_test_util_java',
-        'xwalk_app_runtime_client_java',
-        'xwalk_app_runtime_activity_java',
+        'xwalk_app_runtime_java',
       ],
       'variables': {
         'java_in_dir': 'test/android/util/runtime_client',
@@ -33,6 +32,7 @@
         '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
         'libxwalkcore',
         'xwalk_core_extensions_java',
+        'xwalk_core_internal_java',
         'xwalk_core_java',
         'xwalk_core_shell_apk_pak',
       ],
@@ -43,7 +43,16 @@
         'native_lib_target': 'libxwalkcore',
         'additional_input_paths': [
           '<(PRODUCT_DIR)/xwalk_xwview/assets/www/index.html',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/www/request_focus_left_frame.html',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/www/request_focus_main.html',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/www/request_focus_right_frame.html',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/www/request_focus_right_frame1.html',
           '<(PRODUCT_DIR)/xwalk_xwview/assets/xwalk.pak',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/jsapi/contacts_api.js',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/jsapi/device_capabilities_api.js',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/jsapi/launch_screen_api.js',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/jsapi/messaging_api.js',
+          '<(PRODUCT_DIR)/xwalk_xwview/assets/jsapi/presentation_api.js',
         ],
         'conditions': [
           ['icu_use_data_file_flag==1', {
@@ -59,8 +68,22 @@
           'destination': '<(PRODUCT_DIR)/xwalk_xwview/assets/www',
           'files': [
             'test/android/data/index.html',
+            'test/android/data/request_focus_left_frame.html',
+            'test/android/data/request_focus_main.html',
+            'test/android/data/request_focus_right_frame.html',
+            'test/android/data/request_focus_right_frame1.html',
           ],
-        }
+        },
+        {
+          'destination': '<(PRODUCT_DIR)/xwalk_xwview/assets/jsapi',
+          'files': [
+            'experimental/launch_screen/launch_screen_api.js',
+            'experimental/presentation/presentation_api.js',
+            'runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/contacts/contacts_api.js',
+            'runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/device_capabilities/device_capabilities_api.js',
+            'runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/messaging/messaging_api.js',
+          ],
+        },
       ],
       'includes': [ '../build/java_apk.gypi' ],
     },
@@ -111,15 +134,22 @@
         'is_test_apk': 1,
         'additional_input_paths': [
           '<(PRODUCT_DIR)/xwalk_xwview_test/assets/add_js_interface.html',
-          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/broadcast.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/create_window_1.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/create_window_2.html',
           '<(PRODUCT_DIR)/xwalk_xwview_test/assets/echo.html',
           '<(PRODUCT_DIR)/xwalk_xwview_test/assets/echoSync.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/favicon.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/file_chooser.html',
           '<(PRODUCT_DIR)/xwalk_xwview_test/assets/framesEcho.html',
-          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/geolocation.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/fullscreen_enter_exit.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/fullscreen_togged.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/icon.png',
           '<(PRODUCT_DIR)/xwalk_xwview_test/assets/index.html',
-          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/navigator.online.html',
-          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/notification.html',
-          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/renderHung.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/js_modal_dialog.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/new_window.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/profile.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/scale_changed.html',
+          '<(PRODUCT_DIR)/xwalk_xwview_test/assets/window.close.html',
         ],
         'asset_location': '<(PRODUCT_DIR)/xwalk_xwview_test/assets',
       },
@@ -128,15 +158,22 @@
           'destination': '<(PRODUCT_DIR)/xwalk_xwview_test/assets',
           'files': [
             'test/android/data/add_js_interface.html',
-            'test/android/data/broadcast.html',
+            'test/android/data/create_window_1.html',
+            'test/android/data/create_window_2.html',
             'test/android/data/echo.html',
             'test/android/data/echoSync.html',
+            'test/android/data/favicon.html',
+            'test/android/data/file_chooser.html',
             'test/android/data/framesEcho.html',
-            'test/android/data/geolocation.html',
+            'test/android/data/fullscreen_enter_exit.html',
+            'test/android/data/fullscreen_togged.html',
+            'test/android/data/icon.png',
             'test/android/data/index.html',
-            'test/android/data/navigator.online.html',
-            'test/android/data/notification.html',
-            'test/android/data/renderHung.html',
+            'test/android/data/js_modal_dialog.html',
+            'test/android/data/new_window.html',
+            'test/android/data/profile.html',
+            'test/android/data/scale_changed.html',
+            'test/android/data/window.close.html',
           ],
         },
       ],
@@ -195,69 +232,10 @@
       'includes': [ '../build/apk_test.gypi' ],
     },
     {
-      'target_name': 'xwalk_runtime_shell_apk',
-      'type': 'none',
-      'dependencies': [
-        'libxwalkcore',
-        # Runtime code is also built by this target.
-        'xwalk_runtime_java',
-        'xwalk_runtime_shell_apk_pak',
-      ],
-      'variables': {
-        'apk_name': 'XWalkRuntimeShell',
-        'java_in_dir': 'runtime/android/runtime_shell',
-        'resource_dir': 'runtime/android/runtime_shell/res',
-        'native_lib_target': 'libxwalkcore',
-        'additional_input_paths': [
-          '<(PRODUCT_DIR)/xwalk_runtime/assets/xwalk.pak',
-        ],
-        'conditions': [
-          ['icu_use_data_file_flag==1', {
-            'additional_input_paths': [
-              '<(PRODUCT_DIR)/xwalk_runtime/assets/icudtl.dat',
-            ],
-          }],
-        ],
-        'asset_location': '<(PRODUCT_DIR)/xwalk_runtime/assets',
-      },
-      'includes': [ '../build/java_apk.gypi' ],
-    },
-    {
-      'target_name': 'xwalk_runtime_shell_apk_pak',
-      'type': 'none',
-      'dependencies': [
-        'xwalk_pak',
-      ],
-      'copies': [
-        {
-          'destination': '<(PRODUCT_DIR)/xwalk_runtime/assets',
-          'files': [
-            '<(PRODUCT_DIR)/xwalk.pak',
-          ],
-          'conditions': [
-            ['icu_use_data_file_flag==1', {
-              'files': [
-                '<(PRODUCT_DIR)/icudtl.dat',
-              ],
-            }],
-          ],
-        },
-      ],
-    },
-    {
-      'target_name': 'xwalk_runtime_shell_apk_java',
-      'type': 'none',
-      'dependencies': [
-        'xwalk_runtime_shell_apk',
-      ],
-      'includes': [ '../build/apk_fake_jar.gypi' ],
-    },
-    {
       'target_name': 'xwalk_runtime_client_shell_apk',
       'type': 'none',
       'dependencies': [
-        'xwalk_app_runtime_client_java',
-        'xwalk_app_runtime_activity_java',
+        'xwalk_app_runtime_java',
         'xwalk_runtime_client_test_utils_java',
       ],
       'variables': {
@@ -321,9 +299,8 @@
       'type': 'none',
       'dependencies': [
         'libxwalkcore',
-        'xwalk_app_runtime_client_java',
-        'xwalk_app_runtime_activity_java',
-        'xwalk_runtime_java',
+        'xwalk_app_runtime_java',
+        'xwalk_core_internal_java',
         'xwalk_runtime_client_embedded_shell_apk_pak',
         'xwalk_runtime_client_test_utils_java',
       ],
@@ -335,10 +312,11 @@
         'additional_input_paths': [
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/extensions-config.json',
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/index.html',
+          '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/jsapi/contacts_api.js',
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/jsapi/device_capabilities_api.js',
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/jsapi/launch_screen_api.js',
+          '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/jsapi/messaging_api.js',
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/jsapi/presentation_api.js',
-          '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/jsapi/screen_orientation_api.js',
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/manifest.json',
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/myextension/myextension.js',
           '<(PRODUCT_DIR)/runtime_client_embedded_shell/assets/sampapp-icon-helloworld.png',
@@ -378,8 +356,9 @@
           'files': [
             'experimental/launch_screen/launch_screen_api.js',
             'experimental/presentation/presentation_api.js',
-            'sysapps/device_capabilities/device_capabilities_api.js',
-            'runtime/extension/screen_orientation_api.js',
+            'runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/contacts/contacts_api.js',
+            'runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/device_capabilities/device_capabilities_api.js',
+            'runtime/android/core_internal/src/org/xwalk/core/internal/extension/api/messaging/messaging_api.js',
           ],
         },
         {
@@ -419,24 +398,6 @@
       ],
     },
     {
-      'target_name': 'xwalk_runtime_test_apk',
-      'type': 'none',
-      'dependencies': [
-        '../base/base.gyp:base_java_test_support',
-        '../content/content_shell_and_tests.gyp:content_java_test_support',
-        '../net/net.gyp:net_java_test_support',
-        '../tools/android/forwarder2/forwarder.gyp:forwarder2',
-        '../tools/android/md5sum/md5sum.gyp:md5sum',
-        'xwalk_runtime_shell_apk_java',
-      ],
-      'variables': {
-        'apk_name': 'XWalkRuntimeTest',
-        'java_in_dir': 'test/android/runtime/javatests',
-        'is_test_apk': 1,
-      },
-      'includes': [ '../build/java_apk.gypi' ],
-    },
-    {
       'target_name': 'xwalk_runtime_client_test_apk',
       'type': 'none',
       'dependencies': [
@@ -544,6 +505,7 @@
       'dependencies': [
         'libxwalkcore',
         'xwalk_core_extensions_java',
+        'xwalk_core_internal_java',
         'xwalk_core_java',
         'xwalk_core_shell_apk_pak',
       ],
@@ -553,8 +515,14 @@
         'resource_dir': 'runtime/android/sample/res',
         'native_lib_target': 'libxwalkcore',
         'additional_input_paths': [
+          '<(PRODUCT_DIR)/sample/assets/create_window_1.html',
+          '<(PRODUCT_DIR)/sample/assets/create_window_2.html',
+          '<(PRODUCT_DIR)/sample/assets/echo.html',
+          '<(PRODUCT_DIR)/sample/assets/favicon.html',
+          '<(PRODUCT_DIR)/sample/assets/icon.png',
           '<(PRODUCT_DIR)/sample/assets/index.html',
           '<(PRODUCT_DIR)/sample/assets/manifest.json',
+          '<(PRODUCT_DIR)/sample/assets/new_window.html',
           '<(PRODUCT_DIR)/sample/assets/pause_timers.html',
           '<(PRODUCT_DIR)/sample/assets/xwalk.pak',
         ],
@@ -571,9 +539,76 @@
         {
           'destination': '<(PRODUCT_DIR)/sample/assets',
           'files': [
+            'runtime/android/sample/assets/create_window_1.html',
+            'runtime/android/sample/assets/create_window_2.html',
+            'runtime/android/sample/assets/favicon.html',
+            'runtime/android/sample/assets/icon.png',
             'runtime/android/sample/assets/index.html',
             'runtime/android/sample/assets/manifest.json',
+            'runtime/android/sample/assets/new_window.html',
             'runtime/android/sample/assets/pause_timers.html',
+            'test/android/data/echo.html',
+            '<(PRODUCT_DIR)/xwalk.pak',
+          ],
+          'conditions': [
+            ['icu_use_data_file_flag==1', {
+              'files': [
+                '<(PRODUCT_DIR)/icudtl.dat',
+              ],
+            }],
+          ],
+        },
+      ],
+      'includes': [ '../build/java_apk.gypi' ],
+    },
+    {
+      'target_name': 'xwalk_core_internal_shell_apk',
+      'type': 'none',
+      'dependencies': [
+        '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib',
+        'libxwalkcore',
+        'xwalk_core_extensions_java',
+        'xwalk_core_internal_java',
+        'xwalk_core_internal_shell_apk_pak',
+      ],
+      'variables': {
+        'apk_name': 'XWalkCoreInternalShell',
+        'java_in_dir': 'runtime/android/core_internal_shell',
+        'resource_dir': 'runtime/android/core_internal_shell/res',
+        'native_lib_target': 'libxwalkcore',
+        'additional_input_paths': [
+          '<(PRODUCT_DIR)/xwalk_internal_xwview/assets/www/index.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview/assets/xwalk.pak',
+        ],
+        'conditions': [
+          ['icu_use_data_file_flag==1', {
+            'additional_input_paths': [
+              '<(PRODUCT_DIR)/xwalk_internal_xwview/assets/icudtl.dat',
+            ],
+          }],
+        ],
+        'asset_location': '<(PRODUCT_DIR)/xwalk_internal_xwview/assets',
+      },
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/xwalk_internal_xwview/assets/www',
+          'files': [
+            'test/android/data/index.html',
+          ],
+        }
+      ],
+      'includes': [ '../build/java_apk.gypi' ],
+    },
+    {
+      'target_name': 'xwalk_core_internal_shell_apk_pak',
+      'type': 'none',
+      'dependencies': [
+        'xwalk_pak',
+      ],
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/xwalk_internal_xwview/assets',
+          'files': [
             '<(PRODUCT_DIR)/xwalk.pak',
           ],
           'conditions': [
@@ -585,6 +620,59 @@
           ],
         },
       ],
+    },
+    {
+      'target_name': 'xwalk_core_internal_shell_apk_java',
+      'type': 'none',
+      'dependencies': [
+        'xwalk_core_internal_shell_apk',
+      ],
+      'includes': [ '../build/apk_fake_jar.gypi' ],
+    },
+    {
+      'target_name': 'xwalk_core_internal_test_apk',
+      'type': 'none',
+      'dependencies': [
+        '../base/base.gyp:base_java_test_support',
+        '../content/content_shell_and_tests.gyp:content_java_test_support',
+        '../net/net.gyp:net_java_test_support',
+        '../tools/android/md5sum/md5sum.gyp:md5sum',
+        '../tools/android/forwarder2/forwarder.gyp:forwarder2',
+        'xwalk_core_internal_shell_apk_java',
+      ],
+      'variables': {
+        'apk_name': 'XWalkCoreInternalTest',
+        'java_in_dir': 'test/android/core_internal/javatests',
+        'is_test_apk': 1,
+        'additional_input_paths': [
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/broadcast.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/echo.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/echoSync.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/framesEcho.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/geolocation.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/index.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/navigator.online.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/notification.html',
+          '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets/renderHung.html',
+        ],
+        'asset_location': '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets',
+      },
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)/xwalk_internal_xwview_test/assets',
+          'files': [
+            'test/android/data/broadcast.html',
+            'test/android/data/echo.html',
+            'test/android/data/echoSync.html',
+            'test/android/data/framesEcho.html',
+            'test/android/data/geolocation.html',
+            'test/android/data/index.html',
+            'test/android/data/navigator.online.html',
+            'test/android/data/notification.html',
+            'test/android/data/renderHung.html',
+          ],
+        },
+      ],
       'includes': [ '../build/java_apk.gypi' ],
     },
   ],
Domain: Web Framework / Uncategorized;