Skip to content

Commit

Permalink
Remove stuff not needed for building
Browse files Browse the repository at this point in the history
  • Loading branch information
@niranjanyardi
niranjanyardi committed Feb 4, 2025
1 parent 755a967 commit 7f391ce
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .github/actions/on_host_tests/action.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ runs:
cd "${test_dir}"
for test_binary_path in $(cat out/${{ matrix.platform}}_${{ matrix.config }}/test_targets.json | jq -cr '.executables | join(" ")'); do
test_binary=$(basename "${test_binary_path}" _loader)
test_binary=$(basename "${test_binary_path}")
echo "Running tests for suite: ${test_binary}"
test_filter="*"
Expand Down
1 change: 1 addition & 0 deletions base/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# for multiple conditions, prefer to duplicate it in both lists. This makes it
# a bit easier to see which files apply in which cases rather than having a
# huge sequence of random-looking conditionals.

import("//base/allocator/allocator.gni")
import("//base/allocator/partition_allocator/partition_alloc.gni")
import("//base/debug/debug.gni")
Expand Down
4 changes: 2 additions & 2 deletions cobalt/build/configs/modular_variables.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ declare_args() {
use_custom_libc = false
}

is_cobalt_hermetic_build =
is_starboard && use_custom_libc && current_toolchain == cobalt_toolchain
# TODO: b/371241293 - Replace with is_starboard when the hermetic toolchain is setup
is_cobalt_hermetic_build = is_starboard && use_custom_libc
19 changes: 0 additions & 19 deletions cobalt/build/testing/cobalt_test_templates.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,42 +21,23 @@ template("cobalt_test") {
output_name = actual_target_name
forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY)
testonly = true
_runtime_deps_file = "$root_build_dir/${actual_target_name}.runtime_deps"

if (defined(invoker.data_deps)) {
data_deps += [ ":${loader_target_name}($starboard_toolchain)" ]
} else {
data_deps = [ ":${loader_target_name}($starboard_toolchain)" ]
}
data_deps += [ "//starboard($starboard_toolchain)" ]

write_runtime_deps = _runtime_deps_file
}

if (current_toolchain == starboard_toolchain) {
executable(loader_target_name) {
sources = [ "//$starboard_path/starboard_loader.cc" ]
testonly = true

if (defined(extra_platform_loader_sources)) {
sources += extra_platform_loader_sources
}

if (use_asan) {
sources += [ "//$starboard_path/sanitizer_options.cc" ]
}

output_dir = root_build_dir
defines = [ "SB_LOADER_MODULE=\"$actual_target_name\"" ]
configs += [ "//starboard/build/config:starboard_implementation" ]

ldflags = [
"-Wl,-rpath=" + rebase_path("$root_build_dir/starboard"),
"-Wl,-rpath=" + rebase_path("$root_build_dir"),
"-Wl,-rpath=\$ORIGIN/../lib",
"-Wl,-rpath=\$ORIGIN",
]

deps = [ "//starboard($starboard_toolchain)" ]
}
}
Expand Down
59 changes: 30 additions & 29 deletions cobalt/build/testing/targets/linux-x64x11/test_targets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,34 +33,35 @@
"starboard/nplb:nplb"
],
"executables": [
"out/linux-x64x11_devel/base_unittests_loader",
"out/linux-x64x11_devel/cc_perftests_loader",
"out/linux-x64x11_devel/cc_unittests_loader",
"out/linux-x64x11_devel/viz_perftests_loader",
"out/linux-x64x11_devel/viz_unittests_loader",
"out/linux-x64x11_devel/crypto_unittests_loader",
"out/linux-x64x11_devel/device_unittests_loader",
"out/linux-x64x11_devel/gcm_unit_tests_loader",
"out/linux-x64x11_devel/google_apis_unittests_loader",
"out/linux-x64x11_devel/gles2_conform_test_loader",
"out/linux-x64x11_devel/command_buffer_perftests_loader",
"out/linux-x64x11_devel/gl_tests_loader",
"out/linux-x64x11_devel/gpu_benchmark_loader",
"out/linux-x64x11_devel/gpu_perftests_loader",
"out/linux-x64x11_devel/gpu_unittests_loader",
"out/linux-x64x11_devel/ipc_tests_loader",
"out/linux-x64x11_devel/capture_unittests_loader",
"out/linux-x64x11_devel/media_unittests_loader",
"out/linux-x64x11_devel/midi_unittests_loader",
"out/linux-x64x11_devel/mojo_perftests_loader",
"out/linux-x64x11_devel/ozone_unittests_loader",
"out/linux-x64x11_devel/ppapi_perftests_loader",
"out/linux-x64x11_devel/ppapi_unittests_loader",
"out/linux-x64x11_devel/service_manager_unittests_loader",
"out/linux-x64x11_devel/skia_unittests_loader",
"out/linux-x64x11_devel/sql_unittests_loader",
"out/linux-x64x11_devel/wm_unittests_loader",
"out/linux-x64x11_devel/url_perftests_loader",
"out/linux-x64x11_devel/url_unittests_loader"
"out/linux-x64x11_devel/base_unittests",
"out/linux-x64x11_devel/cc_perftests",
"out/linux-x64x11_devel/cc_unittests",
"out/linux-x64x11_devel/viz_perftests",
"out/linux-x64x11_devel/viz_unittests",
"out/linux-x64x11_devel/crypto_unittests",
"out/linux-x64x11_devel/device_unittests",
"out/linux-x64x11_devel/gcm_unit_tests",
"out/linux-x64x11_devel/google_apis_unittests",
"out/linux-x64x11_devel/gles2_conform_test",
"out/linux-x64x11_devel/command_buffer_perftests",
"out/linux-x64x11_devel/gl_tests",
"out/linux-x64x11_devel/gpu_benchmark",
"out/linux-x64x11_devel/gpu_perftests",
"out/linux-x64x11_devel/gpu_unittests",
"out/linux-x64x11_devel/ipc_tests",
"out/linux-x64x11_devel/capture_unittests",
"out/linux-x64x11_devel/media_unittests",
"out/linux-x64x11_devel/midi_unittests",
"out/linux-x64x11_devel/mojo_perftests",
"out/linux-x64x11_devel/ozone_unittests",
"out/linux-x64x11_devel/ppapi_perftests",
"out/linux-x64x11_devel/ppapi_unittests",
"out/linux-x64x11_devel/service_manager_unittests",
"out/linux-x64x11_devel/skia_unittests",
"out/linux-x64x11_devel/sql_unittests",
"out/linux-x64x11_devel/wm_unittests",
"out/linux-x64x11_devel/url_perftests",
"out/linux-x64x11_devel/url_unittests",
"out/linux-x64x11_devel/nplb"
]
}
18 changes: 1 addition & 17 deletions starboard/linux/x64x11/starboard_loader.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <dlfcn.h>
#include <iostream>
#include "starboard/event.h"

int main(int argc, char** argv) {
static const char* s_target_lib_path = "lib" SB_LOADER_MODULE ".so";
int start_result;

void* handle_ = dlopen(s_target_lib_path, RTLD_LAZY);
if (!handle_) {
std::cerr << "dlopen failure: " << dlerror() << std::endl;
}

void* callback = nullptr;
callback = dlsym(handle_, "SbEventHandle");
if (!callback) {
std::cerr << "dlsym failure: " << dlerror() << std::endl;
}
return SbRunStarboardMain(argc, argv,
reinterpret_cast<SbEventHandleCallback>(callback));
return SbRunStarboardMain(argc, argv, SbEventHandle);
}
3 changes: 2 additions & 1 deletion testing/test.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import("//build/rust/rust_static_library.gni")
import("//build_overrides/build.gni")
if (is_starboard) {
import("//cobalt/build/testing/cobalt_test_templates.gni")
import("//cobalt/build/configs/modular_variables.gni")
}

declare_args() {
Expand Down Expand Up @@ -960,7 +961,7 @@ template("test") {
data_deps += [ ":${invoker.target_name}__rts_filters" ]
}
}
} else if (is_starboard) {
} else if (is_starboard && is_cobalt_hermetic_build) {
cobalt_test(target_name) {
forward_variables_from(invoker,
"*",
Expand Down
6 changes: 0 additions & 6 deletions url/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,6 @@ test("url_unittests") {
"//testing/gtest",
]

if (is_starboard) {
# Replace the standard runner with the starboard test runner in mojo.
sources -= [ "run_all_unittests.cc" ]
deps += [ "//mojo/core/test:run_all_unittests" ]
}

if (use_platform_icu_alternatives) {
# Unit tests that are not supported by the current ICU alternatives on Android.
if (is_android) {
Expand Down

0 comments on commit 7f391ce

Please sign in to comment.