23 files changed, 1 insertions, 1 deletions
diff --git a/remoting/resources/README b/remoting/android/java/README
index 6e6720b..6e6720b 100644
--- a/remoting/resources/README
+++ b/remoting/android/java/README
diff --git a/remoting/resources/android/drawable-hdpi/ic_action_keyboard.png b/remoting/android/java/res/drawable-hdpi/ic_action_keyboard.png
index 35d5611..35d5611 100644
--- a/remoting/resources/android/drawable-hdpi/ic_action_keyboard.png
+++ b/remoting/android/java/res/drawable-hdpi/ic_action_keyboard.png
diff --git a/remoting/resources/android/drawable-mdpi/ic_action_keyboard.png b/remoting/android/java/res/drawable-mdpi/ic_action_keyboard.png
index 5e81588..5e81588 100644
--- a/remoting/resources/android/drawable-mdpi/ic_action_keyboard.png
+++ b/remoting/android/java/res/drawable-mdpi/ic_action_keyboard.png
diff --git a/remoting/resources/android/drawable-xhdpi/ic_action_keyboard.png b/remoting/android/java/res/drawable-xhdpi/ic_action_keyboard.png
index 1af6573..1af6573 100644
--- a/remoting/resources/android/drawable-xhdpi/ic_action_keyboard.png
+++ b/remoting/android/java/res/drawable-xhdpi/ic_action_keyboard.png
diff --git a/remoting/resources/android/drawable-xxhdpi/ic_action_keyboard.png b/remoting/android/java/res/drawable-xxhdpi/ic_action_keyboard.png
index 106cd7e..106cd7e 100644
--- a/remoting/resources/android/drawable-xxhdpi/ic_action_keyboard.png
+++ b/remoting/android/java/res/drawable-xxhdpi/ic_action_keyboard.png
diff --git a/remoting/resources/android/drawable/empty_host_list.png b/remoting/android/java/res/drawable/empty_host_list.png
index 7d2e19b..7d2e19b 100644
--- a/remoting/resources/android/drawable/empty_host_list.png
+++ b/remoting/android/java/res/drawable/empty_host_list.png
diff --git a/remoting/resources/android/drawable/icon_host_offline.png b/remoting/android/java/res/drawable/icon_host_offline.png
index 8c1802c..8c1802c 100644
--- a/remoting/resources/android/drawable/icon_host_offline.png
+++ b/remoting/android/java/res/drawable/icon_host_offline.png
diff --git a/remoting/resources/android/drawable/list_item_disabled_selector.xml b/remoting/android/java/res/drawable/list_item_disabled_selector.xml
index 3f991bd..3f991bd 100644
--- a/remoting/resources/android/drawable/list_item_disabled_selector.xml
+++ b/remoting/android/java/res/drawable/list_item_disabled_selector.xml
diff --git a/remoting/resources/android/drawable/list_item_selector.xml b/remoting/android/java/res/drawable/list_item_selector.xml
index c4b17a8..c4b17a8 100644
--- a/remoting/resources/android/drawable/list_item_selector.xml
+++ b/remoting/android/java/res/drawable/list_item_selector.xml
diff --git a/remoting/resources/android/layout/account_dropdown.xml b/remoting/android/java/res/layout/account_dropdown.xml
index a9f0c96..a9f0c96 100644
--- a/remoting/resources/android/layout/account_dropdown.xml
+++ b/remoting/android/java/res/layout/account_dropdown.xml
diff --git a/remoting/resources/android/layout/account_selected.xml b/remoting/android/java/res/layout/account_selected.xml
index 5eae097..5eae097 100644
--- a/remoting/resources/android/layout/account_selected.xml
+++ b/remoting/android/java/res/layout/account_selected.xml
diff --git a/remoting/resources/android/layout/desktop.xml b/remoting/android/java/res/layout/desktop.xml
index d4ac3e5..d4ac3e5 100644
--- a/remoting/resources/android/layout/desktop.xml
+++ b/remoting/android/java/res/layout/desktop.xml
diff --git a/remoting/resources/android/layout/host.xml b/remoting/android/java/res/layout/host.xml
index 1a37741..1a37741 100644
--- a/remoting/resources/android/layout/host.xml
+++ b/remoting/android/java/res/layout/host.xml
diff --git a/remoting/resources/android/layout/main.xml b/remoting/android/java/res/layout/main.xml
index 975cd6b..975cd6b 100644
--- a/remoting/resources/android/layout/main.xml
+++ b/remoting/android/java/res/layout/main.xml
diff --git a/remoting/resources/android/layout/pin_dialog.xml b/remoting/android/java/res/layout/pin_dialog.xml
index 4ea5dc3..4ea5dc3 100644
--- a/remoting/resources/android/layout/pin_dialog.xml
+++ b/remoting/android/java/res/layout/pin_dialog.xml
diff --git a/remoting/resources/android/menu/chromoting_actionbar.xml b/remoting/android/java/res/menu/chromoting_actionbar.xml
index 07b97f0..07b97f0 100644
--- a/remoting/resources/android/menu/chromoting_actionbar.xml
+++ b/remoting/android/java/res/menu/chromoting_actionbar.xml
diff --git a/remoting/resources/android/menu/desktop_actionbar.xml b/remoting/android/java/res/menu/desktop_actionbar.xml
index f737132..f737132 100644
--- a/remoting/resources/android/menu/desktop_actionbar.xml
+++ b/remoting/android/java/res/menu/desktop_actionbar.xml
diff --git a/remoting/resources/android/menu/help_actionbar.xml b/remoting/android/java/res/menu/help_actionbar.xml
index 09f2625..09f2625 100644
--- a/remoting/resources/android/menu/help_actionbar.xml
+++ b/remoting/android/java/res/menu/help_actionbar.xml
diff --git a/remoting/resources/android/values-land/dimens.xml b/remoting/android/java/res/values-land/dimens.xml
index ffdc015..ffdc015 100644
--- a/remoting/resources/android/values-land/dimens.xml
+++ b/remoting/android/java/res/values-land/dimens.xml
diff --git a/remoting/resources/android/values/colors.xml b/remoting/android/java/res/values/colors.xml
index 0d7b817..0d7b817 100644
--- a/remoting/resources/android/values/colors.xml
+++ b/remoting/android/java/res/values/colors.xml
diff --git a/remoting/resources/android/values/dimens.xml b/remoting/android/java/res/values/dimens.xml
index 3e7b686..3e7b686 100644
--- a/remoting/resources/android/values/dimens.xml
+++ b/remoting/android/java/res/values/dimens.xml
diff --git a/remoting/resources/android/values/styles.xml b/remoting/android/java/res/values/styles.xml
index 881d2bb..881d2bb 100644
--- a/remoting/resources/android/values/styles.xml
+++ b/remoting/android/java/res/values/styles.xml
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index 86b9e56..9a1c1fb 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -95,7 +95,7 @@
             'java_in_dir': 'android/java',
             'R_package': 'org.chromium.chromoting',
             'package_name': '<(_target_name)',
-            'resource_dir': 'resources/android',
+            'resource_dir': 'android/java/res',
             'additional_res_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res' ],
             'additional_input_paths': [
               '<(PRODUCT_DIR)/obj/remoting/remoting_android_resources.actions_rules_copies.stamp',