gn: Add more dependencies to the xwalk_core_reflection_layer_gen target

We were previously not declaring any `sources` or `inputs`, which means the target was not being run when any of the files it processes was modified. In practical terms, it means changing files in `core_internal` did not run the reflection scripts, which lead to a disconnect between `core` and `core_internal` and build failures. Fix it by manually declaring all files this target depends on (the authors of the gyp side cheated by calling `find(1)`). Since these files are also used by `xwalk_core_internal_java`, some new variables were introduced to avoid duplication and to make sure the list is kept up-to-date. BUG=XWALK-7385
fernandoherreradelasheras · Oct 13, 2016 · 0db1a02 · 0db1a02
1 parent 6c66ad8
commit 0db1a02
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 60 deletions.
diff --git a/runtime/android/core_internal/BUILD.gn b/runtime/android/core_internal/BUILD.gn
@@ -8,6 +8,44 @@ import("//xwalk/build/xwalk.gni")
 import("//xwalk/runtime/android/core_internal/chromium_java_deps.gni")
 
 reflection_gen_dir = "$root_gen_dir/xwalk_core_reflection_layer/"
+
+# These files are used by both xwalk_core_internal_java and
+# xwalk_core_reflection_layer_gen, so they are maintained in this variable so
+# changes to the lists are automatically reflected in both targets.
+internal_java_files = [
+  "src/org/xwalk/core/internal/ClientCertRequestHandlerInternal.java",
+  "src/org/xwalk/core/internal/ClientCertRequestInternal.java",
+  "src/org/xwalk/core/internal/CustomViewCallbackHandlerInternal.java",
+  "src/org/xwalk/core/internal/CustomViewCallbackInternal.java",
+  "src/org/xwalk/core/internal/XWalkCookieManagerInternal.java",
+  "src/org/xwalk/core/internal/XWalkDownloadListenerInternal.java",
+  "src/org/xwalk/core/internal/XWalkExtensionInternal.java",
+  "src/org/xwalk/core/internal/XWalkExternalExtensionManagerInternal.java",
+  "src/org/xwalk/core/internal/XWalkFindListenerInternal.java",
+  "src/org/xwalk/core/internal/XWalkGetBitmapCallbackInternal.java",
+  "src/org/xwalk/core/internal/XWalkHitTestResultInternal.java",
+  "src/org/xwalk/core/internal/XWalkHttpAuthHandlerInternal.java",
+  "src/org/xwalk/core/internal/XWalkHttpAuthInternal.java",
+  "src/org/xwalk/core/internal/XWalkJavascriptResultHandlerInternal.java",
+  "src/org/xwalk/core/internal/XWalkJavascriptResultInternal.java",
+  "src/org/xwalk/core/internal/XWalkNativeExtensionLoaderInternal.java",
+  "src/org/xwalk/core/internal/XWalkNavigationHistoryInternal.java",
+  "src/org/xwalk/core/internal/XWalkNavigationItemInternal.java",
+  "src/org/xwalk/core/internal/XWalkPreferencesInternal.java",
+  "src/org/xwalk/core/internal/XWalkResourceClientInternal.java",
+  "src/org/xwalk/core/internal/XWalkSettingsInternal.java",
+  "src/org/xwalk/core/internal/XWalkUIClientInternal.java",
+  "src/org/xwalk/core/internal/XWalkViewInternal.java",
+  "src/org/xwalk/core/internal/XWalkWebResourceRequestHandlerInternal.java",
+  "src/org/xwalk/core/internal/XWalkWebResourceRequestInternal.java",
+  "src/org/xwalk/core/internal/XWalkWebResourceResponseInternal.java",
+]
+reflection_java_files = [
+  "src/org/xwalk/core/internal/ReflectConstructor.java",
+  "src/org/xwalk/core/internal/ReflectField.java",
+  "src/org/xwalk/core/internal/ReflectMethod.java",
+]
+
 android_library("xwalk_core_internal_java") {
   # ATTENTION: do NOT add dependencies on non-//xwalk targets below; they must
   # be added to |core_internal_java_chromium_deps| instead. This variable is
@@ -22,17 +60,10 @@ android_library("xwalk_core_internal_java") {
   java_files = [
     "src/org/xwalk/core/internal/AndroidProtocolHandler.java",
     "src/org/xwalk/core/internal/ClientCertLookupTable.java",
-    "src/org/xwalk/core/internal/ClientCertRequestHandlerInternal.java",
-    "src/org/xwalk/core/internal/ClientCertRequestInternal.java",
-    "src/org/xwalk/core/internal/CustomViewCallbackHandlerInternal.java",
-    "src/org/xwalk/core/internal/CustomViewCallbackInternal.java",
     "src/org/xwalk/core/internal/ErrorCodeConversionHelper.java",
     "src/org/xwalk/core/internal/InMemorySharedPreferences.java",
     "src/org/xwalk/core/internal/MixedContext.java",
     "src/org/xwalk/core/internal/PageLoadListener.java",
-    "src/org/xwalk/core/internal/ReflectConstructor.java",
-    "src/org/xwalk/core/internal/ReflectField.java",
-    "src/org/xwalk/core/internal/ReflectMethod.java",
     "src/org/xwalk/core/internal/SslUtil.java",
     "src/org/xwalk/core/internal/UrlUtilities.java",
     "src/org/xwalk/core/internal/XWalkAPI.java",
@@ -46,46 +77,24 @@ android_library("xwalk_core_internal_java") {
     "src/org/xwalk/core/internal/XWalkContentsClientBridge.java",
     "src/org/xwalk/core/internal/XWalkContentsClientCallbackHelper.java",
     "src/org/xwalk/core/internal/XWalkContentsIoThreadClient.java",
-    "src/org/xwalk/core/internal/XWalkCookieManagerInternal.java",
     "src/org/xwalk/core/internal/XWalkCoreBridge.java",
     "src/org/xwalk/core/internal/XWalkDevToolsServer.java",
     "src/org/xwalk/core/internal/XWalkDownloadListenerImpl.java",
-    "src/org/xwalk/core/internal/XWalkDownloadListenerInternal.java",
-    "src/org/xwalk/core/internal/XWalkExtensionInternal.java",
-    "src/org/xwalk/core/internal/XWalkExternalExtensionManagerInternal.java",
-    "src/org/xwalk/core/internal/XWalkFindListenerInternal.java",
     "src/org/xwalk/core/internal/XWalkGeolocationPermissions.java",
-    "src/org/xwalk/core/internal/XWalkGetBitmapCallbackInternal.java",
-    "src/org/xwalk/core/internal/XWalkHitTestResultInternal.java",
-    "src/org/xwalk/core/internal/XWalkHttpAuthHandlerInternal.java",
-    "src/org/xwalk/core/internal/XWalkHttpAuthInternal.java",
     "src/org/xwalk/core/internal/XWalkInternalResources.java",
-    "src/org/xwalk/core/internal/XWalkJavascriptResultHandlerInternal.java",
-    "src/org/xwalk/core/internal/XWalkJavascriptResultInternal.java",
     "src/org/xwalk/core/internal/XWalkLaunchScreenManager.java",
     "src/org/xwalk/core/internal/XWalkMediaPlayerResourceLoadingFilter.java",
-    "src/org/xwalk/core/internal/XWalkNativeExtensionLoaderInternal.java",
     "src/org/xwalk/core/internal/XWalkNavigationHandler.java",
     "src/org/xwalk/core/internal/XWalkNavigationHandlerImpl.java",
-    "src/org/xwalk/core/internal/XWalkNavigationHistoryInternal.java",
-    "src/org/xwalk/core/internal/XWalkNavigationItemInternal.java",
     "src/org/xwalk/core/internal/XWalkNotificationService.java",
     "src/org/xwalk/core/internal/XWalkNotificationServiceImpl.java",
     "src/org/xwalk/core/internal/XWalkPathHelper.java",
-    "src/org/xwalk/core/internal/XWalkPreferencesInternal.java",
     "src/org/xwalk/core/internal/XWalkPresentationHost.java",
-    "src/org/xwalk/core/internal/XWalkResourceClientInternal.java",
-    "src/org/xwalk/core/internal/XWalkSettingsInternal.java",
     "src/org/xwalk/core/internal/XWalkSwitches.java",
-    "src/org/xwalk/core/internal/XWalkUIClientInternal.java",
     "src/org/xwalk/core/internal/XWalkViewDelegate.java",
-    "src/org/xwalk/core/internal/XWalkViewInternal.java",
     "src/org/xwalk/core/internal/XWalkWebChromeClient.java",
     "src/org/xwalk/core/internal/XWalkWebContentsDelegate.java",
     "src/org/xwalk/core/internal/XWalkWebContentsDelegateAdapter.java",
-    "src/org/xwalk/core/internal/XWalkWebResourceRequestHandlerInternal.java",
-    "src/org/xwalk/core/internal/XWalkWebResourceRequestInternal.java",
-    "src/org/xwalk/core/internal/XWalkWebResourceResponseInternal.java",
     "src/org/xwalk/core/internal/extension/BuiltinXWalkExtensions.java",
     "src/org/xwalk/core/internal/extension/XWalkExtensionWithActivityStateListener.java",
     "src/org/xwalk/core/internal/extension/api/launchscreen/LaunchScreenExtension.java",
@@ -99,6 +108,8 @@ android_library("xwalk_core_internal_java") {
     "src/org/xwalk/core/internal/extension/api/DisplayManagerNull.java",
     "src/org/xwalk/core/internal/extension/api/XWalkDisplayManager.java",
   ]
+  java_files += internal_java_files
+  java_files += reflection_java_files
 }
 
 java_strings_grd("xwalk_core_strings_grd") {
@@ -117,12 +128,32 @@ android_resources("xwalk_core_internal_java_resources") {
 }
 
 action("xwalk_core_reflection_layer_gen") {
+  _xwalk_app_version_tmpl =
+      "//xwalk/runtime/android/templates/XWalkAppVersion.template"
+  _xwalk_core_version_tmpl =
+      "//xwalk/runtime/android/templates/XWalkCoreVersion.template"
+
   script = "//xwalk/tools/reflection_generator/reflection_generator.py"
+  inputs = [
+    "//xwalk/tools/reflection_generator/bridge_generator.py",
+    "//xwalk/tools/reflection_generator/code_generator.py",
+    "//xwalk/tools/reflection_generator/interface_generator.py",
+    "//xwalk/tools/reflection_generator/java_class.py",
+    "//xwalk/tools/reflection_generator/java_class_component.py",
+    "//xwalk/tools/reflection_generator/java_method.py",
+    "//xwalk/tools/reflection_generator/wrapper_generator.py",
+  ]
+  sources = [
+              _xwalk_app_version_tmpl,
+              _xwalk_core_version_tmpl,
+            ] + internal_java_files + reflection_java_files
   args = [
     "--input-dir",
     rebase_path("src/org/xwalk/core/internal/"),
-    "--template-dir",
-    rebase_path("//xwalk/runtime/android/templates/"),
+    "--xwalk-app-version-template-path",
+    rebase_path(_xwalk_app_version_tmpl),
+    "--xwalk-core-version-template-path",
+    rebase_path(_xwalk_core_version_tmpl),
     "--bridge-output",
     rebase_path("$reflection_gen_dir/bridge/"),
     "--wrapper-output",

diff --git a/tools/reflection_generator/reflection_generator.py b/tools/reflection_generator/reflection_generator.py
@@ -130,25 +130,15 @@ def GenerateJavaReflectClass(input_dir, wrapper_path, wrapper_writer):
       wrapper_writer.WriteFile(wrapper_path, helper, wrapped_contents)
 
 
-def GenerateJavaTemplateClass(template_dir, bridge_path, bridge_writer,
-                              wrapper_path, wrapper_writer, mapping):
-  with open(os.path.join(template_dir, 'XWalkAppVersion.template')) as f:
-    contents = f.read()
-    wrapper_writer.WriteFile(wrapper_path, 'XWalkAppVersion.java',
-                             Template(contents).substitute(mapping))
-  with open(os.path.join(template_dir, 'XWalkCoreVersion.template')) as f:
-    contents = f.read()
-    bridge_writer.WriteFile(bridge_path, 'XWalkCoreVersion.java',
-                            Template(contents).substitute(mapping))
-
-
 def main(argv):
   parser = argparse.ArgumentParser()
   parser.add_argument('--input-dir', required=True,
                       help=('Input source file directory which contains input '
                             'files'))
-  parser.add_argument('--template-dir',
-                      help='Templates directory to generate java source file')
+  parser.add_argument('--xwalk-app-version-template-path', required=True,
+                      help='Path to the XWalkAppVersion.template template.')
+  parser.add_argument('--xwalk-core-version-template-path', required=True,
+                      help='Path to the XWalkCoreVersion.template template.')
   parser.add_argument('--bridge-output', required=True,
                       help='Output directory where the bridge code is placed.')
   parser.add_argument('--wrapper-output', required=True,
@@ -197,15 +187,20 @@ def main(argv):
 
   # TODO(rakuco): template handling should not be done in this script.
   # Once we stop supporting gyp, we should do this as part of the build system.
-  if options.template_dir:
-    mapping = {
-      'API_VERSION': options.api_version,
-      'MIN_API_VERSION': options.min_api_version,
-      'XWALK_BUILD_VERSION': options.xwalk_build_version,
-      'VERIFY_XWALK_APK': str(options.verify_xwalk_apk).lower(),
-    }
-    GenerateJavaTemplateClass(options.template_dir, bridge_path, bridge_writer,
-                              wrapper_path, wrapper_writer, mapping)
+  mapping = {
+    'API_VERSION': options.api_version,
+    'MIN_API_VERSION': options.min_api_version,
+    'XWALK_BUILD_VERSION': options.xwalk_build_version,
+    'VERIFY_XWALK_APK': str(options.verify_xwalk_apk).lower(),
+  }
+  with open(os.path.join(options.xwalk_app_version_template_path)) as f:
+    contents = f.read()
+    wrapper_writer.WriteFile(wrapper_path, 'XWalkAppVersion.java',
+                             Template(contents).substitute(mapping))
+  with open(os.path.join(options.xwalk_core_version_template_path)) as f:
+    contents = f.read()
+    bridge_writer.WriteFile(bridge_path, 'XWalkCoreVersion.java',
+                            Template(contents).substitute(mapping))
 
   if options.stamp:
     build_utils.Touch(options.stamp)

diff --git a/xwalk_android.gypi b/xwalk_android.gypi
@@ -58,7 +58,6 @@
       'variables': {
         'script_dir': 'tools/reflection_generator',
         'internal_dir': 'runtime/android/core_internal/src/org/xwalk/core/internal',
-        'template_dir': 'runtime/android/templates',
         'scripts': [
           '>!@(find <(script_dir) -name "*.py")'
         ],
@@ -68,9 +67,8 @@
         'reflect_sources': [
           '>!@(find <(internal_dir) -name "Reflect*.java")'
         ],
-        'templates': [
-          '>!@(find <(template_dir) -name "*.template")'
-        ],
+        'xwalk_app_version_template': 'runtime/android/templates/XWalkAppVersion.template',
+        'xwalk_core_version_template': 'runtime/android/templates/XWalkCoreVersion.template',
         'timestamp': '<(reflection_java_dir)/gen.timestamp',
         'extra_reflection_args': [],
       },
@@ -95,7 +93,8 @@
             '>@(scripts)',
             '>@(internal_sources)',
             '>@(reflect_sources)',
-            '>@(templates)',
+            '<(xwalk_app_version_template)',
+            '<(xwalk_core_version_template)',
             'API_VERSION',
             'VERSION',
           ],
@@ -105,7 +104,8 @@
           'action': [
             'python', '<(script_dir)/reflection_generator.py',
             '--input-dir', '<(internal_dir)',
-            '--template-dir', '<(template_dir)',
+            '--xwalk-app-version-template-path', '<(xwalk_app_version_template)',
+            '--xwalk-core-version-template-path', '<(xwalk_core_version_template)',
             '--bridge-output', '<(reflection_java_dir)/bridge',
             '--wrapper-output', '<(reflection_java_dir)/wrapper',
             '--stamp', '<(timestamp)',