Upstream version 5.34.97.0

[platform/framework/web/crosswalk.git] / src / xwalk / xwalk_android.gypi

diff --git a/src/xwalk/xwalk_android.gypi b/src/xwalk/xwalk_android.gypi
index dd765c7..1d2e5a1 100644 (file)
--- a/src/xwalk/xwalk_android.gypi
+++ b/src/xwalk/xwalk_android.gypi
@@ -40,7 +40,7 @@
         'xwalk_core_extensions_java',
       ],
       'variables': {
-        'java_in_dir': 'runtime/android/java',
+        'java_in_dir': 'runtime/android/core',
         'has_java_resources': 1,
         'R_package': 'org.xwalk.core',
         'R_package_relpath': 'org/xwalk/core',
@@ -49,8 +49,20 @@
       'includes': ['../build/java.gypi'],
     },
     {
+      'target_name': 'xwalk_runtime_java',
+      'type': 'none',
+      'dependencies': [
+        'xwalk_core_java',
+      ],
+      'variables': {
+        'java_in_dir': 'runtime/android/runtime',
+        'has_java_resources': 0,
+      },
+      'includes': ['../build/java.gypi'],
+    },
+    {
       # Use the NativeLibraries.class generated by runtime lib.
-      # It's generated as a '.jar' file used by xwalk_core_embedded.
+      # It's generated as a '.jar' file used by xwalk_runtime_embedded.
       'target_name': 'xwalk_native_libraries_java',
       'type': 'none',
       'dependencies': [
@@ -90,7 +102,7 @@
       ],
     },
     {
-      'target_name': 'xwalk_core_embedded',
+      'target_name': 'xwalk_runtime_embedded',
       'type': 'none',
       'dependencies': [
         'xwalk_core_java',
@@ -98,7 +110,7 @@
       ],
       'actions': [
         {
-          'action_name': 'xwalk_core_embedded',
+          'action_name': 'xwalk_runtime_embedded',
           'variables': {
             'dex_input_paths': [
               '<(PRODUCT_DIR)/lib.java/base_java.dex.jar',
@@ -113,9 +125,10 @@
               '<(PRODUCT_DIR)/lib.java/web_contents_delegate_android_java.dex.jar',
               '<(PRODUCT_DIR)/lib.java/xwalk_core_extensions_java.dex.jar',
               '<(PRODUCT_DIR)/lib.java/xwalk_core_java.dex.jar',
+              '<(PRODUCT_DIR)/lib.java/xwalk_runtime_java.dex.jar',
               '<(SHARED_INTERMEDIATE_DIR)/xwalk_native_libraries/'
                   'xwalk_native_libraries.jar' ],
-            'output_path': '<(PRODUCT_DIR)/lib.java/xwalk_core_embedded.dex.jar',
+            'output_path': '<(PRODUCT_DIR)/lib.java/xwalk_runtime_embedded.dex.jar',
           },
           'includes': [ '../build/android/dex_action.gypi' ],
         },
@@ -137,16 +150,16 @@
         'jni_gen_package': 'xwalk',
       },
       'sources': [
-        'runtime/android/java/src/org/xwalk/core/AndroidProtocolHandler.java',
-        'runtime/android/java/src/org/xwalk/core/InterceptedRequestData.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkHttpAuthHandler.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkContentsClientBridge.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkContentsIoThreadClient.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkContent.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkCookieManager.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkDevToolsServer.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkSettings.java',
-        'runtime/android/java/src/org/xwalk/core/XWalkWebContentsDelegate.java',
+        'runtime/android/core/src/org/xwalk/core/AndroidProtocolHandler.java',
+        'runtime/android/core/src/org/xwalk/core/InterceptedRequestData.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkHttpAuthHandler.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkContentsClientBridge.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkContentsIoThreadClient.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkContent.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkCookieManager.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkDevToolsServer.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkSettings.java',
+        'runtime/android/core/src/org/xwalk/core/XWalkWebContentsDelegate.java',
       ],
       'includes': ['../build/jni_generator.gypi'],
     },
@@ -181,15 +194,14 @@
       'dependencies': [
         'libxwalkcore',
         'xwalk_core_extensions_java',
-        # Runtime code is also built by this target.
-        'xwalk_core_java',
+        'xwalk_runtime_java',
         'xwalk_runtime_lib_apk_extension',
         'xwalk_runtime_lib_apk_pak',
       ],
       'variables': {
         'apk_name': 'XWalkRuntimeLib',
-        'java_in_dir': 'runtime/android/runtimelib',
-        'resource_dir': 'runtime/android/runtimelib/res',
+        'java_in_dir': 'runtime/android/runtime_lib',
+        'resource_dir': 'runtime/android/runtime_lib/res',
         'native_lib_target': 'libxwalkcore',
         'additional_input_paths': [
           '<(PRODUCT_DIR)/xwalk_runtime_lib/assets/jsapi/contacts_api.js',
@@ -230,9 +242,9 @@
           'files': [
             'experimental/launch_screen/launch_screen_api.js',
             'experimental/presentation/presentation_api.js',
-            'runtime/android/java/src/org/xwalk/runtime/extension/api/contacts/contacts_api.js',
-            'runtime/android/java/src/org/xwalk/runtime/extension/api/device_capabilities/device_capabilities_api.js',
-            'runtime/android/java/src/org/xwalk/runtime/extension/api/messaging/messaging_api.js',
+            'runtime/android/core/src/org/xwalk/core/extension/api/contacts/contacts_api.js',
+            'runtime/android/core/src/org/xwalk/core/extension/api/device_capabilities/device_capabilities_api.js',
+            'runtime/android/core/src/org/xwalk/core/extension/api/messaging/messaging_api.js',
             'runtime/extension/screen_orientation_api.js',
           ],
         },