8 files changed, 43 insertions, 7 deletions
diff --git a/remoting/remoting_android.gypi b/remoting/remoting_android.gypi
index 1d2c74c..cdfce6d 100644
--- a/remoting/remoting_android.gypi
+++ b/remoting/remoting_android.gypi
@@ -54,23 +54,23 @@
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/layout',
               'files': [
-                'resources/layout/desktop.xml',
-                'resources/layout/host.xml',
-                'resources/layout/main.xml',
-                'resources/layout/pin_dialog.xml',
+                'resources/android/layout/desktop.xml',
+                'resources/android/layout/host.xml',
+                'resources/android/layout/main.xml',
+                'resources/android/layout/pin_dialog.xml',
               ],
             },
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/menu',
               'files': [
-                'resources/menu/chromoting_actionbar.xml',
-                'resources/menu/desktop_actionbar.xml',
+                'resources/android/menu/chromoting_actionbar.xml',
+                'resources/android/menu/desktop_actionbar.xml',
               ],
             },
             {
               'destination': '<(SHARED_INTERMEDIATE_DIR)/remoting/android/res/values',
               'files': [
-                'resources/strings.xml',
+                'resources/android/values/strings.xml',
               ],
             },
           ],
diff --git a/remoting/resources/layout/desktop.xml b/remoting/resources/android/layout/desktop.xml
index d4ac3e5..d4ac3e5 100644
--- a/remoting/resources/layout/desktop.xml
+++ b/remoting/resources/android/layout/desktop.xml
diff --git a/remoting/resources/layout/host.xml b/remoting/resources/android/layout/host.xml
index c59a592..94b1313 100644
--- a/remoting/resources/layout/host.xml
+++ b/remoting/resources/android/layout/host.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/host_label"
         android:layout_height="wrap_content"
diff --git a/remoting/resources/layout/main.xml b/remoting/resources/android/layout/main.xml
index 5f58217..acb8462 100644
--- a/remoting/resources/layout/main.xml
+++ b/remoting/resources/android/layout/main.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_height="match_parent"
diff --git a/remoting/resources/layout/pin_dialog.xml b/remoting/resources/android/layout/pin_dialog.xml
index 3a49730..8590ce4 100644
--- a/remoting/resources/layout/pin_dialog.xml
+++ b/remoting/resources/android/layout/pin_dialog.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:orientation="vertical"
         android:layout_height="wrap_content"
diff --git a/remoting/resources/menu/chromoting_actionbar.xml b/remoting/resources/android/menu/chromoting_actionbar.xml
index e602a36..d22685b 100644
--- a/remoting/resources/menu/chromoting_actionbar.xml
+++ b/remoting/resources/android/menu/chromoting_actionbar.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
 <!--Action bar buttons for the Android app's host listing-->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/actionbar_directoryrefresh"
diff --git a/remoting/resources/menu/desktop_actionbar.xml b/remoting/resources/android/menu/desktop_actionbar.xml
index 0efb3fb..05f97ef 100644
--- a/remoting/resources/menu/desktop_actionbar.xml
+++ b/remoting/resources/android/menu/desktop_actionbar.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
 <!--Action bar buttons for the Android app's remote desktop viewer-->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/actionbar_keyboard"
diff --git a/remoting/resources/strings.xml b/remoting/resources/android/values/strings.xml
index 0ef75a9..c51e3cf 100644
--- a/remoting/resources/strings.xml
+++ b/remoting/resources/android/values/strings.xml
@@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file.
+-->
+
 <!--User-facing strings for the Android app-->
 <!--TODO(solb) Merge in with localized strings-->
 <resources>