Skip to content

Commit

Permalink
Use toolchain defined in starboard path (#3763)
Browse files Browse the repository at this point in the history
This prevents the duplication of native_target toolchain if it's defined
in both path android/arm/toolchain and $starboard_path/toolchain

b/291130824

(cherry picked from commit dfd6db9)
  • Loading branch information
Rongo-JL authored and anonymous1-me committed Jul 9, 2024
1 parent 5d3f4e1 commit d95f162
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions starboard/loader_app/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ if (sb_is_evergreen_compatible && sb_evergreen_compatible_package) {
install_content = true
sources = [ "$root_out_dir/native_target/crashpad_handler" ]
outputs = [ "$root_out_dir/libcrashpad_handler.so" ]
<<<<<<< HEAD
deps = [ "//third_party/crashpad/handler:crashpad_handler(//starboard/android/arm/toolchain:native_target)" ]
=======
deps = [ "//third_party/crashpad/crashpad/handler:crashpad_handler(//$starboard_path/toolchain:native_target)" ]
>>>>>>> dfd6db9df6c (Use toolchain defined in starboard path (#3763))
}
}

Expand Down

0 comments on commit d95f162

Please sign in to comment.