chromium/src
0
Fork 0
Code Activity

Revert "Remove dependencies from ppapi_tests_extensions_packaged_app on //ipc (and //base)"

Browse Source 
This reverts commit 9aa873ca10.

Reason for revert: Caused compile error on linux-archive-rel bot
https://ci.chromium.org/ui/p/chromium/builders/ci/linux-archive-rel/56236/overview

Original change's description:
> Remove dependencies from ppapi_tests_extensions_packaged_app on //ipc (and //base)
>
> https://chromium-review.googlesource.com/c/chromium/src/+/970165 added
> this dependency for `gn check`. However, there's no real dependency
> here, and adding it means we needlessly build close to a thousand TUs
> with the newlib_pnacl toolchain.
>
> Bug: 812058,1106311,1269607
> Change-Id: I4afc98d211efc4fef31abea272b8df02d3a531de
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3298179
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Commit-Queue: Raymes Khoury <raymes@chromium.org>
> Auto-Submit: Nico Weber <thakis@chromium.org>
> Reviewed-by: Raymes Khoury <raymes@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#944784}

Bug: 812058,1106311,1269607
Change-Id: Icb6d5a17d6851167d9d0ccbc5592f4874bed1c20
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3299648
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Owners-Override: Kunihiko Sakamoto <ksakamoto@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#944788}
This commit is contained in:
Kunihiko Sakamoto
2021-11-24 01:53:53 +00:00
committed by Chromium LUCI CQ
parent 5979f9e210
commit c4fc8603dd
3 changed files with 7 additions and 13 deletions
ppapi
native_client
nacl_test_data.gni
tests
extensions
BUILD.gn
packaged_app
test_packaged_app.cc

1
ppapi/native_client/nacl_test_data.gni

@ -163,7 +163,6 @@ template("nacl_test_data") {
forward_variables_from(invoker,
[
"cflags",
"assert_no_deps",
"defines",
"include_dirs",
"ldflags",

13
ppapi/tests/extensions/BUILD.gn

@ -19,8 +19,8 @@ group("extensions") {
":ppapi_tests_extensions_popup($newlib)",
":ppapi_tests_extensions_socket_permissions($newlib)",
]
if ((target_cpu == "x86" || target_cpu == "x64") &&
(is_linux || is_chromeos) && enable_nacl_nonsfi) {
if ((target_cpu == "x86" || target_cpu == "x64") && (is_linux || is_chromeos) &&
enable_nacl_nonsfi) {
nonsfi = "//build/toolchain/nacl:newlib_pnacl_nonsfi"
data_deps += [ ":ppapi_tests_extensions_packaged_app($nonsfi)" ]
}
@ -116,11 +116,10 @@ if (is_nacl && !is_nacl_nonsfi) {
if (is_nacl) {
nacl_test_data("ppapi_tests_extensions_packaged_app") {
sources = [ "packaged_app/test_packaged_app.cc" ]
deps = [ "//ppapi/cpp" ]
# This is built with a nacl toolchain, so it shouldn't pull in
# any of chrome's "actual" code.
assert_no_deps = [ "//base" ]
deps = [
"//ipc:message_support",
"//ppapi/cpp",
]
destination_dir = "test_data/ppapi/tests/extensions/packaged_app"
test_files = [
"packaged_app/controller.js",

6
ppapi/tests/extensions/packaged_app/test_packaged_app.cc

@ -22,11 +22,7 @@
#if defined(__clang__)
// ipc_message_attachment_set.h depends on C++11 which nacl-g++ does not
// fully support.
// This include s used only to access the constnant
// IPC::MessageAttachmentSet::kMaxDescriptorsPerMessage which is defined
// directly in the .h file. This means we don't need to depend
// on the //ipc::message_support target in the build file.
#include "ipc/ipc_message_attachment_set.h" // nogncheck
#include "ipc/ipc_message_attachment_set.h"
#endif
namespace {