diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 22:00:20 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 22:00:20 +0000 |
| commit | 60da8fea83fe4517bc87636d2dab5da6daaa5c5b (patch) | |
| tree | 5a75cf551ddc5400c7b8c5f43f33cd5c513d53de /ppapi/ppapi_tests.gypi | |
| parent | c09ee0801839629e85f87cb787a9fcee4e40fc6f (diff) | |
| download | chromium_src-60da8fea83fe4517bc87636d2dab5da6daaa5c5b.zip chromium_src-60da8fea83fe4517bc87636d2dab5da6daaa5c5b.tar.gz chromium_src-60da8fea83fe4517bc87636d2dab5da6daaa5c5b.tar.bz2 | |
Build libppapi_cpp.a under SHARED_INTERMEDIATE_DIR, so ppapi_tests can find it.
Without this, building with ninja fails because the libppapi_cpp.a library is put in a different path under PRODUCT_DIR than it would be with make, and ppapi_tests was hard-coded to expect that path.
TEST=Building with 'ninja all' doesn't give dependency errors.
Review URL: http://codereview.chromium.org/8673007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_tests.gypi')
| -rw-r--r-- | ppapi/ppapi_tests.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index acc1870..5b52c24 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -444,12 +444,12 @@ '-lppapi', ], 'extra_deps64': [ - '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi_cpp.a', - '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi.a', + '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a', + '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a', ], 'extra_deps32': [ - '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi_cpp.a', - '<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi.a', + '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a', + '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a', ], 'sources': [ # Common test files |