Skip to content

Commit 0e499ac

Browse files
authored
Move a few vendor libraries to src/native/external (#62673)
* Move brotli to src/native/external * Move rapidjson to src/native/external * Move zlib to src/native/external * Move zlib-intel to src/native/external * Cleanup trailing whitespace in changeset files
1 parent 71bf3ba commit 0e499ac

243 files changed

Lines changed: 98 additions & 11574 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/mono/mono/metadata/debug-mono-ppdb.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <mono/utils/mono-logger-internals.h>
3131

3232
#if HOST_WIN32 || HOST_WASM
33-
#include "../zlib/zlib.h"
33+
#include <external/zlib/zlib.h>
3434
#elif HAVE_SYS_ZLIB
3535
#include <zlib.h>
3636
#endif
@@ -85,7 +85,7 @@ get_pe_debug_info (MonoImage *image, guint8 *out_guid, gint32 *out_age, gint32 *
8585
debug_dir.size_of_data = read32(data + 16);
8686
debug_dir.address = read32(data + 20);
8787
debug_dir.pointer = read32(data + 24);
88-
88+
8989
if (debug_dir.type == DEBUG_DIR_ENTRY_CODEVIEW && debug_dir.major_version == 0x100 && debug_dir.minor_version == 0x504d) {
9090
/* This is a 'CODEVIEW' debug directory */
9191
CodeviewDebugDirectory dir;
@@ -593,7 +593,7 @@ mono_ppdb_get_seq_points_internal (MonoImage *image, MonoPPDBFile *ppdb, MonoMet
593593
return n_seqs;
594594
}
595595

596-
gboolean
596+
gboolean
597597
mono_ppdb_get_seq_points_enc (MonoDebugMethodInfo *minfo, MonoPPDBFile *ppdb_file, int idx, char **source_file, GPtrArray **source_file_list, int **source_files, MonoSymSeqPoint **seq_points, int *n_seq_points)
598598
{
599599
MonoMethod *method = minfo->method;
@@ -610,7 +610,7 @@ mono_ppdb_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrAr
610610
MonoMethod *method = minfo->method;
611611

612612
int method_idx = mono_metadata_token_index (method->token);
613-
613+
614614
mono_ppdb_get_seq_points_internal (image, ppdb, method, method_idx, source_file, source_file_list, source_files, seq_points, n_seq_points);
615615
}
616616

@@ -622,7 +622,7 @@ mono_ppdb_lookup_locals_internal (MonoImage *image, int method_idx)
622622

623623
guint32 cols [MONO_LOCALSCOPE_SIZE];
624624
guint32 locals_cols [MONO_LOCALVARIABLE_SIZE];
625-
625+
626626
int i, lindex, sindex, locals_idx, locals_end_idx, nscopes, start_scope_idx, scope_idx;
627627

628628
start_scope_idx = mono_metadata_localscope_from_methoddef (image, method_idx);
@@ -733,7 +733,7 @@ mono_ppdb_lookup_locals (MonoDebugMethodInfo *minfo)
733733

734734
method_idx = mono_metadata_token_index (method->token);
735735

736-
736+
737737
return mono_ppdb_lookup_locals_internal (image, method_idx);
738738
}
739739

src/mono/mono/mini/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ include(../utils/CMakeLists.txt)
3939
include(../metadata/CMakeLists.txt)
4040
include(../sgen/CMakeLists.txt)
4141
if(INTERNAL_ZLIB) # TODO: hook up HAVE_SYS_ZLIB instead
42-
include(../zlib/CMakeLists.txt)
42+
include(${CLR_SRC_NATIVE_DIR}/external/zlib.cmake)
4343
endif()
4444
include(../component/CMakeLists.txt)
4545

@@ -313,7 +313,7 @@ elseif(NOT HOST_BROWSER)
313313
set(mini_sources "${mini_sources};${VERSION_FILE_PATH}") # this is generated by GenerateNativeVersionFile in Arcade
314314
endif()
315315

316-
set(monosgen-sources "${metadata_sources};${utils_sources};${sgen_sources};${icu_shim_sources};${mini_sources};${zlib_sources}")
316+
set(monosgen-sources "${metadata_sources};${utils_sources};${sgen_sources};${icu_shim_sources};${mini_sources};${ZLIB_SOURCES}")
317317

318318
add_library(monosgen-objects OBJECT "${monosgen-sources}")
319319
add_library(monosgen-static STATIC $<TARGET_OBJECTS:monosgen-objects>;$<TARGET_OBJECTS:eglib_objects>)

src/mono/mono/zlib/.gitignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)