summaryrefslogtreecommitdiffstats
path: root/content/content_shell.gypi
diff options
context:
space:
mode:
authornavabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 21:05:56 +0000
committernavabi@google.com <navabi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-26 21:05:56 +0000
commitdccbbb1d1c707faab941be02f0f68ab805d0a7a7 (patch)
tree3e15c351fbc74f4c8e8399fb1489e7837fe31287 /content/content_shell.gypi
parent6f5fac9d1b4c8bfc924ed555f46c3e67a8a8f962 (diff)
downloadchromium_src-dccbbb1d1c707faab941be02f0f68ab805d0a7a7.zip
chromium_src-dccbbb1d1c707faab941be02f0f68ab805d0a7a7.tar.gz
chromium_src-dccbbb1d1c707faab941be02f0f68ab805d0a7a7.tar.bz2
Move java files into src parent directory.
BUG=134704 TEST= TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10668039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144272 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
-rw-r--r--content/content_shell.gypi8
1 files changed, 4 insertions, 4 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 599d5f2..a41d172 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -472,8 +472,8 @@
'type': 'none',
'variables': {
'java_sources': [
- 'shell/android/java/org/chromium/content_shell/ShellManager.java',
- 'shell/android/java/org/chromium/content_shell/ShellView.java',
+ 'shell/android/java/src/org/chromium/content_shell/ShellManager.java',
+ 'shell/android/java/src/org/chromium/content_shell/ShellView.java',
],
'jni_headers': [
'<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_manager_jni.h',
@@ -549,7 +549,7 @@
{
'action_name': 'content_shell_apk',
'inputs': [
- '<(DEPTH)/content/shell/android/content_shell_apk.xml',
+ '<(DEPTH)/content/shell/android/java/content_shell_apk.xml',
'<(DEPTH)/content/shell/android/AndroidManifest.xml',
'<!@(find shell/android/java -name "*.java")',
'<!@(find shell/android/res -name "*")',
@@ -571,7 +571,7 @@
'-DPRODUCT_DIR=<(ant_build_out)',
'-DAPP_ABI=<(android_app_abi)',
'-buildfile',
- '<(DEPTH)/content/shell/android/content_shell_apk.xml',
+ '<(DEPTH)/content/shell/android/java/content_shell_apk.xml',
]
}
],