Skip to content

Commit

Permalink
Make nplb part of default target
Browse files Browse the repository at this point in the history
Change-Id: I433a8b7d4bd8054600c74daa12180ada11a443bc
  • Loading branch information
niranjanyardi committed Aug 30, 2024
1 parent c7a41b2 commit 32d51ce
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 12 deletions.
2 changes: 1 addition & 1 deletion starboard/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ group("gn_all") {
"//starboard/examples/hello_world:starboard_hello_world_example",
"//starboard/examples/window:starboard_window_example",
"//starboard/extension:extension_test",
"//starboard/nplb",
]
if (sb_is_evergreen_compatible && current_toolchain == starboard_toolchain) {
deps += [ "//starboard/nplb/nplb_evergreen_compat_tests" ]
Expand Down Expand Up @@ -100,6 +99,7 @@ group("gn_all") {
group("default") {
deps = [
":starboard_group",
"//starboard/nplb",
"//starboard/tools:build_app_launcher_zip",
]
}
Expand Down
4 changes: 2 additions & 2 deletions starboard/nplb/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
import("//starboard/build/config/os_definitions.gni")

target(gtest_target_type, "nplb") {
testonly = true

sources = [
"//starboard/common/test_main.cc",
"//starboard/common/thread.cc",
"//starboard/common/thread.h",
"//starboard/nplb/sabi/alignment_test.cc",
"//starboard/nplb/sabi/endianness_test.cc",
"//starboard/nplb/sabi/signedness_and_size_of_enum_test.cc",
Expand Down
2 changes: 0 additions & 2 deletions testing/gmock/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
# into //third_party/googletest.

source_set("gmock") {
testonly = true
sources = [
"include/gmock/gmock-actions.h",
"include/gmock/gmock-matchers.h",
Expand All @@ -20,6 +19,5 @@ source_set("gmock") {
# it stabilizes, Chromium code MUST use this target instead of reaching directly
# into //third_party/googletest.
source_set("gmock_main") {
testonly = true
deps = [ "//third_party/googletest:gmock_main" ]
}
5 changes: 1 addition & 4 deletions testing/gtest/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@ config("gtest_direct_config") {
# it stabilizes, Chromium code MUST use this target instead of reaching directly
# into //third_party/googletest.
static_library("gtest") {
testonly = true


sources = [
"include/gtest/gtest-death-test.h",
"include/gtest/gtest-message.h",
"include/gtest/gtest-param-test.h",
"include/gtest/gtest-spi.h",
"include/gtest/gtest.h",



"include/gtest/gtest_prod.h",

# This is a workaround for the issues below.
Expand Down
3 changes: 0 additions & 3 deletions third_party/googletest/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ config("gmock_config") {
# Do NOT depend on this directly. Use //testing/gtest instead.
# See README.chromium for details.
source_set("gtest") {
testonly = true
sources = [
# "custom/gtest/internal/custom/gtest.h",
# "custom/gtest/internal/custom/stack_trace_getter.cc",
Expand Down Expand Up @@ -171,7 +170,6 @@ source_set("gtest_main") {
# Do NOT depend on this directly. Use //testing/gmock instead.
# See README.chromium for details.
source_set("gmock") {
testonly = true
sources = [
"src/googlemock/include/gmock/gmock-actions.h",
"src/googlemock/include/gmock/gmock-cardinalities.h",
Expand Down Expand Up @@ -205,7 +203,6 @@ source_set("gmock") {
# Do NOT depend on this directly. Use //testing/gmock:gmock_main instead.
# See README.chromium for details.
static_library("gmock_main") {
testonly = true
sources = [ "src/googlemock/src/gmock_main.cc" ]
deps = [ ":gmock" ]
}

0 comments on commit 32d51ce

Please sign in to comment.