OLD | NEW |
---|---|
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 copy("copy_test_files") { | 5 copy("copy_test_files") { |
6 visibility = [ ":*" ] | 6 visibility = [ ":*" ] |
7 sources = [ | 7 sources = [ |
8 # Keep "test_case.html.mock-http-headers" with "test_case.html". | 8 # Keep "test_case.html.mock-http-headers" with "test_case.html". |
9 "tests/ppapi_nacl_tests_newlib.nmf", | 9 "tests/ppapi_nacl_tests_newlib.nmf", |
10 "tests/test_case.html", | 10 "tests/test_case.html", |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
142 sources = [ | 142 sources = [ |
143 "tools/pepper_hash_for_uma.cc", | 143 "tools/pepper_hash_for_uma.cc", |
144 ] | 144 ] |
145 | 145 |
146 deps = [ | 146 deps = [ |
147 "//base", | 147 "//base", |
148 "//build/config/sanitizers:deps", | 148 "//build/config/sanitizers:deps", |
149 ] | 149 ] |
150 } | 150 } |
151 | 151 |
152 source_set("ppapi_cpp_lib") { | 152 static_library("ppapi_cpp_lib") { |
Dirk Pranke
2015/11/11 22:19:06
why this change?
Petr Hosek
2015/11/13 22:18:33
Because some of the NaCl browser tests redefine so
Dirk Pranke
2015/11/13 23:00:57
Ew. That seems bad. Can you file a separate bug fo
Petr Hosek
2015/11/17 01:31:58
Done, see https://code.google.com/p/chromium/issue
| |
153 sources = ppapi_sources.cpp_source_files | 153 sources = ppapi_sources.cpp_source_files |
154 sources += [ | 154 sources += [ |
155 "cpp/module_embedder.h", | 155 "cpp/module_embedder.h", |
156 "cpp/ppp_entrypoints.cc", | 156 "cpp/ppp_entrypoints.cc", |
157 ] | 157 ] |
158 deps = [ | 158 deps = [ |
159 "//build/config/nacl:nacl_base", | 159 "//build/config/nacl:nacl_base", |
160 ] | 160 ] |
161 } | 161 } |
162 | 162 |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
408 group("ppapi_nacl_tests_all") { | 408 group("ppapi_nacl_tests_all") { |
409 data_deps = [ | 409 data_deps = [ |
410 ":copy_test_files", | 410 ":copy_test_files", |
411 ":nacl_tests_copy(//build/toolchain/nacl:clang_newlib_${target_cpu})", | 411 ":nacl_tests_copy(//build/toolchain/nacl:clang_newlib_${target_cpu})", |
412 ":generate_nmf(//build/toolchain/nacl:glibc_${target_cpu})", | 412 ":generate_nmf(//build/toolchain/nacl:glibc_${target_cpu})", |
413 ":generate_nmf(//build/toolchain/nacl:newlib_pnacl)", | 413 ":generate_nmf(//build/toolchain/nacl:newlib_pnacl)", |
414 ":generate_nonsfi_nmf(//build/toolchain/nacl:newlib_pnacl_nonsfi)", | 414 ":generate_nonsfi_nmf(//build/toolchain/nacl:newlib_pnacl_nonsfi)", |
415 ] | 415 ] |
416 } | 416 } |
417 } | 417 } |
OLD | NEW |