Commit 60da8fea authored by wez@chromium.org's avatar wez@chromium.org

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
parent c09ee080
...@@ -333,6 +333,7 @@ ...@@ -333,6 +333,7 @@
'nlib_target': 'libppapi_cpp.a', 'nlib_target': 'libppapi_cpp.a',
'build_glibc': 0, 'build_glibc': 0,
'build_newlib': 1, 'build_newlib': 1,
'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_newlib',
'sources': [ 'sources': [
'cpp/audio.cc', 'cpp/audio.cc',
'cpp/audio.h', 'cpp/audio.h',
......
...@@ -444,12 +444,12 @@ ...@@ -444,12 +444,12 @@
'-lppapi', '-lppapi',
], ],
'extra_deps64': [ 'extra_deps64': [
'<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi_cpp.a', '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi_cpp.a',
'<(PRODUCT_DIR)/obj/gen/tc_newlib/lib64/libppapi.a', '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib64/libppapi.a',
], ],
'extra_deps32': [ 'extra_deps32': [
'<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi_cpp.a', '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi_cpp.a',
'<(PRODUCT_DIR)/obj/gen/tc_newlib/lib32/libppapi.a', '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a',
], ],
'sources': [ 'sources': [
# Common test files # Common test files
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment