diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 23:20:06 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 23:20:06 +0000 |
| commit | 5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1 (patch) | |
| tree | 09dcb390edb2f9ffabde598a9c7d818231fe21c5 /content/content.gyp | |
| parent | 2d3fe6aa560d4726575a6b8d32102597511f50bf (diff) | |
| download | chromium_src-5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1.zip chromium_src-5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1.tar.gz chromium_src-5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1.tar.bz2 | |
Revert 179189
Failed to rename package name in buildbot scripts. Broke buildbots.
> 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
TBR=nileshagrawal@chromium.org
Review URL: https://codereview.chromium.org/12088031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/content/content.gyp b/content/content.gyp index d15f86f..0155546 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -290,7 +290,6 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base', - '../media/media.gyp:media_java', '../net/net.gyp:net', '../ui/ui.gyp:ui_java', 'common_aidl', |