Move source-location logic to GN configuration

Issue: 152473909 Issue: 256660693 Reviewed-on: #2972
youtube · Apr 18, 2024 · 28a3998 · 28a3998
2 parents 324b566 + d54f51e
commit 28a3998
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/third_party/crashpad/crashpad/third_party/lss/BUILD.gn b/third_party/crashpad/crashpad/third_party/lss/BUILD.gn
@@ -17,6 +17,8 @@ import("../../build/crashpad_buildconfig.gni")
 config("lss_config") {
   if (crashpad_is_in_chromium) {
     defines = [ "CRASHPAD_LSS_SOURCE_EXTERNAL" ]
+  } else if (crashpad_is_in_starboard || crashpad_is_in_native_target_build) {
+    defines = [ "CRASHPAD_LSS_SOURCE_EXTERNAL" ]
   } else {
     defines = [ "CRASHPAD_LSS_SOURCE_EMBEDDED" ]
   }

diff --git a/third_party/crashpad/crashpad/third_party/lss/lss.h b/third_party/crashpad/crashpad/third_party/lss/lss.h
@@ -15,9 +15,7 @@
 #ifndef CRASHPAD_THIRD_PARTY_LSS_LSS_H_
 #define CRASHPAD_THIRD_PARTY_LSS_LSS_H_
 
-#if defined(STARBOARD) || NATIVE_TARGET_BUILD
-#include "third_party/lss/linux_syscall_support.h"
-#elif defined(CRASHPAD_LSS_SOURCE_EXTERNAL)
+#if defined(CRASHPAD_LSS_SOURCE_EXTERNAL)
 #include "third_party/lss/linux_syscall_support.h"
 #elif defined(CRASHPAD_LSS_SOURCE_EMBEDDED)
 #include "third_party/lss/lss/linux_syscall_support.h"