Post-merge fixups

dotnet · May 16, 2024 · 59290b3 · 59290b3
1 parent 5c218e3
commit 59290b3
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 207 deletions.
diff --git a/build-tools/cmake/xa_preamble.cmake b/build-tools/cmake/xa_preamble.cmake
diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt
@@ -63,18 +63,13 @@ endif()
 
 option(ENABLE_CLANG_ASAN "Enable the clang AddressSanitizer support" OFF)
 option(ENABLE_CLANG_UBSAN "Enable the clang UndefinedBehaviorSanitizer support" OFF)
-<<<<<<< HEAD
 option(ENABLE_PERFETTO "Enable use of perfetto." OFF)
 
 if(ENABLE_CLANG_ASAN OR ENABLE_CLANG_UBSAN)
-  if(ENABLE_PERFETT)
+  if(ENABLE_PERFETTO)
     message(FATAL_ERROR "Perfetto and analyzer builds cannot be enabled at the same time")
   endif()
 
-=======
-
-if(ENABLE_CLANG_ASAN OR ENABLE_CLANG_UBSAN)
->>>>>>> main
   set(STRIP_DEBUG_DEFAULT OFF)
   set(ANALYZERS_ENABLED ON)
 else()
@@ -109,19 +104,11 @@ else()
   set(USES_LIBSTDCPP True)
 endif()
 
-<<<<<<< HEAD
 if(ANALYZERS_ENABLED OR ENABLE_PERFETTO)
   message(STATUS "Analyzers or perfetto enabled")
   set(SHARED_LIB_NAME xa::shared-no-abi)
 else()
   message(STATUS "NO analyzers or perfetto enabled")
-=======
-if(ANALYZERS_ENABLED)
-  message(STATUS "Analyzers enabled")
-  set(SHARED_LIB_NAME xa::shared-no-abi)
-else()
-  message(STATUS "NO analyzers enabled")
->>>>>>> main
   set(SHARED_LIB_NAME xa::shared)
 endif()
 #
@@ -184,7 +171,6 @@ macro(xa_add_compile_definitions TARGET)
     PLATFORM_ANDROID
   )
 
-<<<<<<< HEAD
   if(ENABLE_PERFETTO)
     target_compile_definitions(
       ${TARGET}
@@ -202,8 +188,6 @@ macro(xa_add_compile_definitions TARGET)
     )
   endif()
 
-=======
->>>>>>> main
   if(ANDROID_ABI MATCHES "^(arm64-v8a|x86_64)")
     target_compile_definitions(
       ${TARGET}
@@ -480,14 +464,11 @@ add_link_options("$<$<COMPILE_LANGUAGE:C>:${COMMON_C_LINKER_ARGS}>")
 
 add_subdirectory(libunwind)
 add_subdirectory(lz4)
-<<<<<<< HEAD
 
 if(ENABLE_PERFETTO)
   add_subdirectory(perfetto)
 endif()
 
-=======
->>>>>>> main
 add_subdirectory(libstub)
 add_subdirectory(shared)
 add_subdirectory(java-interop)

diff --git a/src/native/CMakePresets.json.in b/src/native/CMakePresets.json.in
@@ -53,11 +53,7 @@
         },
 
         {
-<<<<<<< HEAD
             "name": "use-stdlib",
-=======
-            "name": "analyzers-common",
->>>>>>> main
             "hidden": true,
             "inherits": "common",
             "cacheVariables": {
@@ -81,21 +77,13 @@
         {
             "name": "analyzers-debug",
             "hidden": true,
-<<<<<<< HEAD
             "inherits": ["use-stdlib", "common-debug"]
-=======
-            "inherits": ["analyzers-common", "common-debug"]
->>>>>>> main
         },
 
         {
             "name": "analyzers-release",
             "hidden": true,
-<<<<<<< HEAD
             "inherits": ["use-stdlib", "common-release"]
-=======
-            "inherits": ["analyzers-common", "common-release"]
->>>>>>> main
         },
 
         {
@@ -143,7 +131,6 @@
         },
 
         {
-<<<<<<< HEAD
             "name": "perfetto-common",
             "hidden": true,
             "cacheVariables": {
@@ -152,8 +139,6 @@
         },
 
         {
-=======
->>>>>>> main
             "name": "asan-common",
             "hidden": true,
             "cacheVariables": {
@@ -180,7 +165,6 @@
         },
 
         {
-<<<<<<< HEAD
             "name": "perfetto-debug-armeabi-v7a",
             "inherits": ["use-stdlib", "perfetto-common", "common-debug", "common-armeabi-v7a"]
         },
@@ -194,21 +178,12 @@
             "name": "analyzers-debug-armeabi-v7a",
             "hidden": true,
             "inherits": ["use-stdlib", "common-debug", "common-armeabi-v7a"]
-=======
-            "name": "analyzers-debug-armeabi-v7a",
-            "hidden": true,
-            "inherits": ["analyzers-common", "common-debug", "common-armeabi-v7a"]
->>>>>>> main
         },
 
         {
             "name": "analyzers-release-armeabi-v7a",
             "hidden": true,
-<<<<<<< HEAD
             "inherits": ["use-stdlib", "common-release", "common-armeabi-v7a"]
-=======
-            "inherits": ["analyzers-common", "common-release", "common-armeabi-v7a"]
->>>>>>> main
         },
 
         {
@@ -244,7 +219,6 @@
         },
 
         {
-<<<<<<< HEAD
             "name": "perfetto-debug-arm64-v8a",
             "inherits": ["use-stdlib", "perfetto-common", "common-debug", "common-arm64-v8a"]
         },
@@ -258,21 +232,12 @@
             "name": "analyzers-debug-arm64-v8a",
             "hidden": true,
             "inherits": ["use-stdlib", "common-debug", "common-arm64-v8a"]
-=======
-            "name": "analyzers-debug-arm64-v8a",
-            "hidden": true,
-            "inherits": ["analyzers-common", "common-debug", "common-arm64-v8a"]
->>>>>>> main
         },
 
         {
             "name": "analyzers-release-arm64-v8a",
             "hidden": true,
-<<<<<<< HEAD
             "inherits": ["use-stdlib", "common-release", "common-arm64-v8a"]
-=======
-            "inherits": ["analyzers-common", "common-release", "common-arm64-v8a"]
->>>>>>> main
         },
 
         {
@@ -308,7 +273,6 @@
         },
 
         {
-<<<<<<< HEAD
             "name": "perfetto-debug-x86",
             "inherits": ["use-stdlib", "perfetto-common", "common-debug", "common-x86"]
         },
@@ -322,21 +286,12 @@
             "name": "analyzers-debug-x86",
             "hidden": true,
             "inherits": ["use-stdlib", "common-debug", "common-x86"]
-=======
-            "name": "analyzers-debug-x86",
-            "hidden": true,
-            "inherits": ["analyzers-common", "common-debug", "common-x86"]
->>>>>>> main
         },
 
         {
             "name": "analyzers-release-x86",
             "hidden": true,
-<<<<<<< HEAD
             "inherits": ["use-stdlib", "common-release", "common-x86"]
-=======
-            "inherits": ["analyzers-common", "common-release", "common-x86"]
->>>>>>> main
         },
 
         {
@@ -372,7 +327,6 @@
         },
 
         {
-<<<<<<< HEAD
             "name": "perfetto-debug-x86_64",
             "inherits": ["use-stdlib", "perfetto-common", "common-debug", "common-x86_64"]
         },
@@ -386,21 +340,12 @@
             "name": "analyzers-debug-x86_64",
             "hidden": true,
             "inherits": ["use-stdlib", "common-debug", "common-x86_64"]
-=======
-            "name": "analyzers-debug-x86_64",
-            "hidden": true,
-            "inherits": ["analyzers-common", "common-debug", "common-x86_64"]
->>>>>>> main
         },
 
         {
             "name": "analyzers-release-x86_64",
             "hidden": true,
-<<<<<<< HEAD
             "inherits": ["use-stdlib", "common-release", "common-x86_64"]
-=======
-            "inherits": ["analyzers-common", "common-release", "common-x86_64"]
->>>>>>> main
         },
 
         {