diff options
| author | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:21:00 +0000 |
|---|---|---|
| committer | nileshagrawal@chromium.org <nileshagrawal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:21:00 +0000 |
| commit | 5b1dd76b96fb9d05f8163fc7b04721ba0ed64cf3 (patch) | |
| tree | 305984b92fdec4b0bc7c0e34393b52a37a173ec8 /build/java_apk.gypi | |
| parent | 5cba6d8eb4b4072b3d38fb79e03322bc627672f5 (diff) | |
| download | chromium_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 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index a887663..fb79797 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -18,12 +18,10 @@ # 'includes': ['path/to/this/gypi/file'], # } # -# Note that this assumes that there's an ant buildfile <package_name>_apk.xml in -# java_in_dir. So, if you have package_name="content_shell" and +# If you have package_name="content_shell" and # java_in_dir="content/shell/android/java" you should have a directory structure # like: # -# content/shell/android/java/content_shell_apk.xml # content/shell/android/java/src/org/chromium/base/Foo.java # content/shell/android/java/src/org/chromium/base/Bar.java # @@ -41,8 +39,8 @@ # each directory in additional_res_dirs. # additional_src_dirs - Additional directories with .java files to be compiled # and included in the output of this target. -# asset_location - The directory where assets are located (default: -# <PRODUCT_DIR>/<package_name>/assets). +# asset_location - The absolute path to the directory where assets are located +# (default: <(ant_build_out)/<(package_name)/assets). # generated_src_dirs - Same as additional_src_dirs except used for .java files # that are generated at build time. This should be set automatically by a # target's dependencies. The .java files in these directories are not |