summaryrefslogtreecommitdiffstats
path: root/content/content.gyp
diff options
context:
space:
mode:
authornileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-28 21:21:00 +0000
committernileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-28 21:21:00 +0000
commit5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3 (patch)
tree305984b92fdec4b0bc7c0e34393b52a37a173ec8 /content/content.gyp
parent5cba6d8eb4b4072b3d38fb79e03322bc627672f5 (diff)
downloadchromium_src-5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3.zip
chromium_src-5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3.tar.gz
chromium_src-5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3.tar.bz2
Add apk for running content_browsertests
Split off org.chromium.content_shell into: org.chromium.content_shell - content shell java code, builds a jar, directory structure similar to other jar targets org.chromium.content_shell_apk - application code to build content_shell_apk, directory structure similar to that of android application org.chromium.content_browsertests_apk - application code to build content_browsertests_apk Also splitting content/shell/android/res into: - content/shell/android/java/res - content/shell/android/shell_apk/res Both content_shell_apk and content_browsertests_apk will depend on content_shell_java target to include java/res needed to show a shell based browser. I will do another CL to move The java files for content_shell_tests_apk to content_shell_apk package. BUG=138275 Review URL: https://chromiumcodereview.appspot.com/12047068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
-rw-r--r--content/content.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp
index 0155546..d15f86f 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -290,6 +290,7 @@
'type': 'none',
'dependencies': [
'../base/base.gyp:base',
+ '../media/media.gyp:media_java',
'../net/net.gyp:net',
'../ui/ui.gyp:ui_java',
'common_aidl',