diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 23:23:51 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 23:23:51 +0000 |
| commit | 300800480f12dc97c8e9d90dd101fabd29203115 (patch) | |
| tree | 21cfcb39e090675b55c3c512da10ee721bd11817 /chrome/chrome.gyp | |
| parent | 4f3db5b5a785511a73282af279d3f30c975944a9 (diff) | |
| download | chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.zip chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.tar.gz chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.tar.bz2 | |
[Android] Add chrome_java target for building Java code in the chromium layer.
Also includes a refactoring of the Ant xml scripts to use a common template (contributed by shashishekhar@chromium.org). As part of this, I also continued Torne's effort of removing our reliance on environment variables. Unfortunately this currently means that you have to specify 5 gyp flags:
ANDROID_SDK, ANDROID_SDK_ROOT, ANDROID_SDK_TOOLS, ANDROID_SDK_VERSION, ANDROID_TOOLCHAIN.
This'll get better as we make further use of the checked in sdk both upstream and downstream. The problem stems from the android tree and released sdk having different configurations.
Review URL: https://chromiumcodereview.appspot.com/10830012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index eae32d9..e9a108c 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1073,5 +1073,24 @@ }, ]}, # 'targets' ], # OS=="win" + ['OS=="android"', + { + 'targets': [ + { + 'target_name': 'chrome_java', + 'type': 'none', + 'dependencies': [ + '../base/base.gyp:base_java', + '../content/content.gyp:content_java', + '../net/net.gyp:net_java', + ], + 'variables': { + 'package_name': 'chrome', + 'java_in_dir': '../chrome/android/java', + }, + 'includes': [ '../build/java.gypi' ], + }, + ]}, # 'targets' + ], # OS=="android" ], # 'conditions' } |