summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authoreroman <eroman@chromium.org>2015-02-27 15:41:24 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-27 23:41:58 +0000
commitd593eac9968cee2b5412ba22638ed16f0884c408 (patch)
tree4b9141e61f879d7e7b226a6d250c72de847e65d6 /ppapi
parent77b5872e9a7181afcc3b59881af5218a0d42ea7b (diff)
downloadchromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.zip
chromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.tar.gz
chromium_src-d593eac9968cee2b5412ba22638ed16f0884c408.tar.bz2
Revert of Add remoting and PPAPI tests to GN build (patchset #7 id:120001 of https://codereview.chromium.org/965633002/)
Reason for revert: http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%20GN&number=4498 ERROR at //remoting/host/BUILD.gn:56:7: Item not found "linux/x_server_clipboard.cc", ^---------------------------- You were trying to remove "linux/x_server_clipboard.cc" Original issue's description: > Add remoting and PPAPI tests to GN build > > BUG= > > Committed: https://crrev.com/d0437210926b14b1b7e06b2b56174fc92ade9c37 > Cr-Commit-Position: refs/heads/master@{#318539} TBR=kelvinp@chromium.org,dpranke@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/970443002 Cr-Commit-Position: refs/heads/master@{#318545}
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/BUILD.gn76
-rw-r--r--ppapi/ppapi_host.gypi2
-rw-r--r--ppapi/ppapi_tests.gypi4
3 files changed, 2 insertions, 80 deletions
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn
index 7ecb40a..f7ff011 100644
--- a/ppapi/BUILD.gn
+++ b/ppapi/BUILD.gn
@@ -3,8 +3,6 @@
# found in the LICENSE file.
import("//ppapi/ppapi_sources.gni")
-import("//testing/test.gni")
-
shared_library("ppapi_tests") {
sources = ppapi_sources.test_common_source_files +
ppapi_sources.test_trusted_source_files
@@ -17,76 +15,4 @@ shared_library("ppapi_tests") {
"//ppapi/shared_impl",
]
}
-
-test("ppapi_unittests") {
- sources = [
- "host/resource_message_filter_unittest.cc",
- "proxy/device_enumeration_resource_helper_unittest.cc",
- "proxy/file_chooser_resource_unittest.cc",
- "proxy/file_system_resource_unittest.cc",
- "proxy/flash_resource_unittest.cc",
- "proxy/interface_list_unittest.cc",
- "proxy/mock_resource.cc",
- "proxy/mock_resource.h",
- "proxy/nacl_message_scanner_unittest.cc",
- "proxy/pdf_resource_unittest.cc",
- "proxy/plugin_dispatcher_unittest.cc",
- "proxy/plugin_resource_tracker_unittest.cc",
- "proxy/plugin_var_tracker_unittest.cc",
- "proxy/ppb_var_unittest.cc",
- "proxy/ppp_instance_private_proxy_unittest.cc",
- "proxy/ppp_instance_proxy_unittest.cc",
- "proxy/ppp_messaging_proxy_unittest.cc",
- "proxy/printing_resource_unittest.cc",
- "proxy/raw_var_data_unittest.cc",
- "proxy/serialized_var_unittest.cc",
- "proxy/talk_resource_unittest.cc",
- "proxy/video_decoder_resource_unittest.cc",
- "proxy/video_encoder_resource_unittest.cc",
- "proxy/websocket_resource_unittest.cc",
- "shared_impl/media_stream_audio_track_shared_unittest.cc",
- "shared_impl/media_stream_buffer_manager_unittest.cc",
- "shared_impl/media_stream_video_track_shared_unittest.cc",
- "shared_impl/proxy_lock_unittest.cc",
- "shared_impl/resource_tracker_unittest.cc",
- "shared_impl/thread_aware_callback_unittest.cc",
- "shared_impl/time_conversion_unittest.cc",
- "shared_impl/tracked_callback_unittest.cc",
- "shared_impl/var_tracker_unittest.cc",
- ]
-
- deps = [
- "//base/allocator",
- "//base/test:run_all_unittests",
- "//base/test:test_support",
- "//gpu/ipc",
- "//ipc",
- "//ipc:test_support",
- "//media:shared_memory_support",
- "//ppapi/host",
- "//ppapi/proxy",
- "//ppapi/proxy:test_support",
- "//ppapi/shared_impl",
- "//ppapi/shared_impl:test_support",
- "//testing/gmock",
- "//testing/gtest",
- "//ui/surface",
- ]
-}
-
-test("ppapi_perftests") {
- sources = [
- "proxy/ppapi_perftests.cc",
- "proxy/ppp_messaging_proxy_perftest.cc",
- ]
-
- deps = [
- "//base/allocator",
- "//base/test:test_support",
- "//ppapi/proxy",
- "//ppapi/proxy:test_support",
- "//ppapi/shared_impl",
- "//ppapi/shared_impl:test_support",
- "//testing/gtest",
- ]
-}
+# TODO(GYP) other targets from ppapi_tests.gyp
diff --git a/ppapi/ppapi_host.gypi b/ppapi/ppapi_host.gypi
index 3113ddf..eea53b4 100644
--- a/ppapi/ppapi_host.gypi
+++ b/ppapi/ppapi_host.gypi
@@ -5,7 +5,7 @@
{
'targets': [
{
- # GN version: //ppapi/host
+ # GN version: //ppapi:ppapi_host
'target_name': 'ppapi_host',
'type': '<(component)',
'dependencies': [
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index ee4fd54..562903d 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -5,7 +5,6 @@
{
'targets': [
{
- # GN version: //ppapi:ppapi_tests
'target_name': 'ppapi_tests',
'type': 'loadable_module',
'include_dirs': [
@@ -107,7 +106,6 @@
},
{
- # GN version: //ppapi:ppapi_perftests
'target_name': 'ppapi_perftests',
'type': 'executable',
'variables': {
@@ -134,7 +132,6 @@
],
},
{
- # GN version: //ppapi:ppapi_unittests
'target_name': 'ppapi_unittests',
'type': 'executable',
'variables': {
@@ -156,7 +153,6 @@
'../ui/surface/surface.gyp:surface',
],
'sources': [
- # Note: sources list duplicated in GN build.
'host/resource_message_filter_unittest.cc',
'proxy/device_enumeration_resource_helper_unittest.cc',
'proxy/file_chooser_resource_unittest.cc',