diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:19:13 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-29 23:19:13 +0000 |
| commit | ef7ed7a0015169e08e83e7cb283026c24673354a (patch) | |
| tree | 2f138dbc5a7bae6349b833d675a87278db2267ac /net/net.gyp | |
| parent | 955d5dc6362d7276d5773e68d1999a01d3ea281b (diff) | |
| download | chromium_src-ef7ed7a0015169e08e83e7cb283026c24673354a.zip chromium_src-ef7ed7a0015169e08e83e7cb283026c24673354a.tar.gz chromium_src-ef7ed7a0015169e08e83e7cb283026c24673354a.tar.bz2 | |
Fix ninja build for android.
The primary issues is specifying the right path to PRODUCT_DIR (i.e.
out/Release). The gyp generator for make specifies the absolute path but
for ninja would use a relative path. Since the gyp targets don't line
up with where the ant build files are located this causes failures such
as base's java being generated in base/android/out/Release/...
See:
https://groups.google.com/forum/#!msg/gyp-developer/K2T_9obUya0/qq78_Ut-E-AJ
for details.
A couple of other minor fixes:
- content java files are placed in out/Release/java/content to be
consisent with other packages.
- shared-libraries are now referenced by correct variables for apk-based
tests
- removed unused media/base/android/java/java.gyp (target is in
media/media.gyp)
TBR=mark@chromium.org,ben@chromium.org,rsleevi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10386188
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/net.gyp b/net/net.gyp index b347646..904fb4f 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1864,7 +1864,7 @@ ], 'variables': { 'test_suite_name': 'net_unittests', - 'input_shlib_path': '<(PRODUCT_DIR)/lib.target/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)', + 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)net_unittests<(SHARED_LIB_SUFFIX)', 'input_jars_paths': [ '<(PRODUCT_DIR)/lib.java/chromium_base.jar', '<(PRODUCT_DIR)/lib.java/chromium_net.jar', |