Add python script for generating brige and wrapper code.

app/android/runtime_client/src/org/xwalk/app/runtime/extension/XWalkExtensionClient.java

@@ -25,7 +25,7 @@
  */
 public class XWalkExtensionClient extends CrossPackageWrapper {
 
-    private final static String EXTENSION_CLASS_NAME = "org.xwalk.core.extension.XWalkExtensionClientImpl";
+    private final static String EXTENSION_CLASS_NAME = "org.xwalk.core.internal.extension.XWalkExtensionClientImpl";
     private Object mInstance;
     private Method mGetExtensionName;
     private Method mGetJsApi;

app/android/runtime_client/src/org/xwalk/app/runtime/extension/XWalkExtensionContextClient.java

@@ -23,7 +23,7 @@
  */
 public final class XWalkExtensionContextClient extends CrossPackageWrapper {
     private final static String EXTENSION_CLASS_NAME =
-            "org.xwalk.core.extension.XWalkExtensionContextWrapper";
+            "org.xwalk.core.internal.extension.XWalkExtensionContextWrapper";
     private Object mInstance;
     private Method mGetContext;
     private Method mGetActivity;

app/tools/android/make_apk.py

@@ -316,7 +316,7 @@ def Execution(options, name):
 
     res_ui_java = os.path.join('gen', 'ui_java')
     res_content_java = os.path.join('gen', 'content_java')
-    res_xwalk_java = os.path.join('gen', 'xwalk_core_java')
+    res_xwalk_java = os.path.join('gen', 'xwalk_core_internal_java')
     res_dirs = ('-DADDITIONAL_RES_DIRS='
                 + os.path.join(res_ui_java, 'res_crunched') + ' '
                 + os.path.join(res_ui_java, 'res_v14_compatibility') + ' '
@@ -331,7 +331,7 @@ def Execution(options, name):
                 + os.path.join('libs_res', 'runtime') + ' '
                 + os.path.join(res_xwalk_java, 'res_grit'))
     res_packages = ('-DADDITIONAL_RES_PACKAGES=org.chromium.ui '
-                    'org.xwalk.core org.chromium.content')
+                    'org.xwalk.core.internal org.chromium.content')
     res_r_text_files = ('-DADDITIONAL_R_TEXT_FILES='
                         + os.path.join(res_ui_java, 'java_R', 'R.txt') + ' '
                         + os.path.join(res_xwalk_java, 'java_R', 'R.txt') + ' '

build/android/generate_app_packaging_tool.py

@@ -76,7 +76,7 @@ def PrepareFromXwalk(src_dir, target_dir):
      os.path.join(target_dir, 'libs_res/content')),
     (os.path.join(source_code_dir, 'ui/android/java/res'),
      os.path.join(target_dir, 'libs_res/ui')),
-    (os.path.join(source_code_dir, 'xwalk/runtime/android/core/res'),
+    (os.path.join(source_code_dir, 'xwalk/runtime/android/core_internal/res'),
      os.path.join(target_dir, 'libs_res/runtime')),
 
     (os.path.join(gen_res_src_dir, 'ui_java/java_R'),
@@ -97,14 +97,16 @@ def PrepareFromXwalk(src_dir, target_dir):
     (os.path.join(gen_res_src_dir, 'content_java/res_v14_compatibility'),
      os.path.join(gen_res_target_dir, 'content_java/res_v14_compatibility')),
 
-    (os.path.join(gen_res_src_dir, 'xwalk_core_java/java_R'),
-     os.path.join(gen_res_target_dir, 'xwalk_core_java/java_R')),
-    (os.path.join(gen_res_src_dir, 'xwalk_core_java/res_crunched'),
-     os.path.join(gen_res_target_dir, 'xwalk_core_java/res_crunched')),
-    (os.path.join(gen_res_src_dir, 'xwalk_core_java/res_grit'),
-     os.path.join(gen_res_target_dir, 'xwalk_core_java/res_grit')),
-    (os.path.join(gen_res_src_dir, 'xwalk_core_java/res_v14_compatibility'),
-     os.path.join(gen_res_target_dir, 'xwalk_core_java/res_v14_compatibility')),
+    (os.path.join(gen_res_src_dir, 'xwalk_core_internal_java/java_R'),
+     os.path.join(gen_res_target_dir, 'xwalk_core_internal_java/java_R')),
+    (os.path.join(gen_res_src_dir, 'xwalk_core_internal_java/res_crunched'),
+     os.path.join(gen_res_target_dir, 'xwalk_core_internal_java/res_crunched')),
+    (os.path.join(gen_res_src_dir, 'xwalk_core_internal_java/res_grit'),
+     os.path.join(gen_res_target_dir, 'xwalk_core_internal_java/res_grit')),
+    (os.path.join(gen_res_src_dir,
+         'xwalk_core_internal_java/res_v14_compatibility'),
+     os.path.join(gen_res_target_dir,
+         'xwalk_core_internal_java/res_v14_compatibility')),
 
     # The app wrapper code. It's the template Java code.
     (os.path.join(source_code_dir, 'xwalk/app/android/app_template'),

extensions/android/java/src/org/xwalk/core/extensions/XWalkExtensionAndroid.java → extensions/android/java/src/org/xwalk/core/internal/extensions/XWalkExtensionAndroid.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.core.extensions;
+package org.xwalk.core.internal.extensions;
 
 import android.util.Log;
 

runtime/android/core_empty/src/org/xwalk/core/README.md

@@ -0,0 +1,9 @@
+# Source folder for xwalk core reflection related java targets.
+## Why it's empty
+The source codes for reflection are generated at build time.
+The gyp system still needs a java_in_dir to work.
+So there is no java src here.
+## Why put me here
+To make git keep the folder, the src directory is needed to
+build an apk.
+

runtime/android/core_internal/resource_map/org/xwalk/core/internal/R.java

@@ -0,0 +1,188 @@
+// Copyright 2014 Intel Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.xwalk.core.internal;
+
+/**
+ * Provide XWalk Core internal resources to XWalk Core layer.
+ * The main purpose is to dynamically set the value of following
+ * resources ids when building xwalk core as a library project.
+ * In such case, the ant build system won't generate R.java
+ * for package org.xwalk.core.internal. However, the code inside
+ * org.xwalk.core.internal uses org.xwalk.core.internal.R.
+ */
+
+public final class R {
+    public static final class attr {
+        public static int select_dialog_multichoice;
+        public static int select_dialog_singlechoice;
+    }
+    public static final class color {
+        public static int autofill_dark_divider_color;
+        public static int autofill_divider_color;
+        public static int color_picker_background_color;
+        public static int color_picker_border_color;
+    }
+    public static final class dimen {
+        public static int autofill_text_divider_height;
+        public static int autofill_text_height;
+        public static int color_button_height;
+        public static int color_picker_gradient_margin;
+        public static int config_min_scaling_span;
+        public static int config_min_scaling_touch_major;
+        public static int link_preview_overlay_radius;
+    }
+    public static final class drawable {
+        public static int autofill_popup_background;
+        public static int autofill_popup_background_down;
+        public static int autofill_popup_background_up;
+        public static int bubble;
+        public static int bubble_arrow_up;
+        public static int color_button_background;
+        public static int color_picker_advanced_select_handle;
+        public static int color_picker_border;
+        public static int ic_menu_search_holo_light;
+        public static int ic_menu_share_holo_light;
+        public static int ondemand_overlay;
+        public static int pageinfo_warning_major;
+    }
+    public static final class id {
+        public static int ampm;
+        public static int arrow_image;
+        public static int autofill_label;
+        public static int autofill_menu_text;
+        public static int autofill_popup_window;
+        public static int autofill_sublabel;
+        public static int color_button_swatch;
+        public static int color_picker_advanced;
+        public static int color_picker_simple;
+        public static int date_picker;
+        public static int date_time_suggestion;
+        public static int date_time_suggestion_label;
+        public static int date_time_suggestion_value;
+        public static int gradient;
+        public static int gradient_border;
+        public static int hour;
+        public static int icon_view;
+        public static int main_text;
+        public static int milli;
+        public static int minute;
+        public static int more_colors_button;
+        public static int more_colors_button_border;
+        public static int pickers;
+        public static int position_in_year;
+        public static int second;
+        public static int second_colon;
+        public static int second_dot;
+        public static int seek_bar;
+        public static int select_action_menu_copy;
+        public static int select_action_menu_cut;
+        public static int select_action_menu_paste;
+        public static int select_action_menu_select_all;
+        public static int select_action_menu_share;
+        public static int select_action_menu_web_search;
+        public static int selected_color_view;
+        public static int selected_color_view_border;
+        public static int sub_text;
+        public static int text;
+        public static int text_wrapper;
+        public static int time_picker;
+        public static int title;
+        public static int top_view;
+        public static int year;
+    }
+    public static final class layout {
+        public static int autofill_text;
+        public static int color_picker_advanced_component;
+        public static int color_picker_dialog_content;
+        public static int color_picker_dialog_title;
+        public static int date_time_picker_dialog;
+        public static int date_time_suggestion;
+        public static int multi_field_time_picker_dialog;
+        public static int two_field_date_picker;
+        public static int validation_message_bubble;
+    }
+    public static final class menu {
+        public static int select_action_menu;
+    }
+    public static final class mipmap {
+        public static int app_icon;
+    }
+    public static final class string {
+        public static int accessibility_content_view;
+        public static int accessibility_date_picker_month;
+        public static int accessibility_date_picker_week;
+        public static int accessibility_date_picker_year;
+        public static int accessibility_datetime_picker_date;
+        public static int accessibility_datetime_picker_time;
+        public static int accessibility_time_picker_ampm;
+        public static int accessibility_time_picker_hour;
+        public static int accessibility_time_picker_milli;
+        public static int accessibility_time_picker_minute;
+        public static int accessibility_time_picker_second;
+        public static int actionbar_share;
+        public static int actionbar_web_search;
+        public static int color_picker_button_black;
+        public static int color_picker_button_blue;
+        public static int color_picker_button_cancel;
+        public static int color_picker_button_cyan;
+        public static int color_picker_button_green;
+        public static int color_picker_button_magenta;
+        public static int color_picker_button_more;
+        public static int color_picker_button_red;
+        public static int color_picker_button_set;
+        public static int color_picker_button_white;
+        public static int color_picker_button_yellow;
+        public static int color_picker_dialog_title;
+        public static int color_picker_hue;
+        public static int color_picker_saturation;
+        public static int color_picker_value;
+        public static int copy_to_clipboard_failure_message;
+        public static int cpu_arch_mismatch_message;
+        public static int cpu_arch_mismatch_title;
+        public static int date_picker_dialog_clear;
+        public static int date_picker_dialog_other_button_label;
+        public static int date_picker_dialog_set;
+        public static int date_picker_dialog_title;
+        public static int date_time_picker_dialog_title;
+        public static int download_already_exists_toast;
+        public static int download_failed_toast;
+        public static int download_finished_toast;
+        public static int download_no_permission_toast;
+        public static int download_start_toast;
+        public static int goto_store_button_label;
+        public static int http_auth_log_in;
+        public static int http_auth_password;
+        public static int http_auth_title;
+        public static int http_auth_user_name;
+        public static int js_alert_title;
+        public static int js_confirm_title;
+        public static int js_prompt_title;
+        public static int low_memory_error;
+        public static int media_player_error_button;
+        public static int media_player_error_text_invalid_progressive_playback;
+        public static int media_player_error_text_unknown;
+        public static int media_player_error_title;
+        public static int media_player_loading_video;
+        public static int month_picker_dialog_title;
+        public static int opening_file_error;
+        public static int profiler_error_toast;
+        public static int profiler_no_storage_toast;
+        public static int profiler_started_toast;
+        public static int profiler_stopped_toast;
+        public static int report_feedback_button_label;
+        public static int ssl_alert_title;
+        public static int time_picker_dialog_am;
+        public static int time_picker_dialog_hour_minute_separator;
+        public static int time_picker_dialog_minute_second_separator;
+        public static int time_picker_dialog_pm;
+        public static int time_picker_dialog_second_subsecond_separator;
+        public static int time_picker_dialog_title;
+        public static int week_picker_dialog_title;
+    }
+    public static final class style {
+        public static int AutofillPopupWindow;
+        public static int SelectPopupDialog;
+    }
+}

runtime/android/core/src/org/xwalk/core/JavascriptInterface.java → runtime/android/core_internal/src/org/xwalk/core/JavascriptInterface.java

@@ -14,7 +14,7 @@
  * Marks a method as being able to be exposed to JavaScript.  This is used for
  * safety purposes so that only explicitly marked methods get exposed instead
  * of every method in a class.
- * See the explanation for {@link XWalkView#addJavascriptInterface(Object, String)}
+ * See the explanation for {@link XWalkViewInternal#addJavascriptInterface(Object, String)}
  * about the usage.
  */
 @SuppressWarnings("javadoc")

runtime/android/core/src/org/xwalk/core/AndroidProtocolHandler.java → runtime/android/core_internal/src/org/xwalk/core/internal/AndroidProtocolHandler.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.core;
+package org.xwalk.core.internal;
 
 import android.content.Context;
 import android.content.res.AssetManager;

runtime/android/core/src/org/xwalk/core/DownloadListener.java → runtime/android/core_internal/src/org/xwalk/core/internal/DownloadListener.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.xwalk.core;
+package org.xwalk.core.internal;
 
 interface DownloadListener {