Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grendello merged 6 commits into from
Jul 24, 2024
Merged

Native runtime reorganization #9113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c0f844
Move native stuff around
grendello Jul 16, 2024
74f30ce
Fix p/invoke tables generator script
grendello Jul 16, 2024
79bd0b6
Update the list of p/invokes, slight generated code changes
grendello Jul 16, 2024
4347b0e
Formatting
grendello Jul 16, 2024
add253c
Adjust after rebase
grendello Jul 22, 2024
c7fc926
Fix post-rebase issues
grendello Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-tools/scripts/generate-pinvoke-tables.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down
3 changes: 2 additions & 1 deletion src/native/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
add_subdirectory(xamarin-debug-app-helper)
Expand Down
12 changes: 7 additions & 5 deletions src/native/java-interop/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
${XA_COMMON_CXX_ARGS}
)

set_target_properties(
${LIB_NAME}
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
set_target_properties(
${LIB_NAME}
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
endif()

xa_add_compile_definitions(${LIB_NAME})
1 change: 1 addition & 0 deletions src/native/libstub/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down
12 changes: 7 additions & 5 deletions src/native/lz4/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
"$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
${LIB_NAME}
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
set_target_properties(
${LIB_NAME}
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
endif()

xa_add_compile_definitions(${LIB_NAME})
167 changes: 93 additions & 74 deletions src/native/monodroid/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
# Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
debug-constants.cc
debug.cc
embedded-assemblies-zip.cc
embedded-assemblies.cc
globals.cc
internal-pinvokes.cc
jni-remapping.cc
mono-log-adapter.cc
monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
osbridge.cc
pinvoke-override-api.cc
runtime-util.cc
timing.cc
timezones.cc
timing-internal.cc
xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
${XAMARIN_MONO_ANDROID_LIB}
PRIVATE
HAVE_CONFIG_H
HAVE_LZ4
JI_DLL_EXPORT
JI_NO_VISIBILITY
MONO_DLL_EXPORT
NET
TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
target_compile_definitions(
${XAMARIN_MONO_ANDROID_LIB}
PRIVATE
NO_INLINE
if(BUILD_STATIC_LIBRARY)
add_library(
${XAMARIN_MONO_ANDROID_STATIC_LIB}
STATIC
${XAMARIN_MONODROID_SOURCES}
)
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
target_compile_definitions(
${XAMARIN_MONO_ANDROID_LIB}
${TARGET_NAME}
PRIVATE
DEBUG
HAVE_CONFIG_H
HAVE_LZ4
JI_DLL_EXPORT
JI_NO_VISIBILITY
MONO_DLL_EXPORT
NET
TSL_NO_EXCEPTIONS
)
endif()

if (ENABLE_TIMING)
target_compile_definitions(
${XAMARIN_MONO_ANDROID_LIB}
if(DONT_INLINE)
target_compile_definitions(
${TARGET_NAME}
PRIVATE
NO_INLINE
)
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
target_compile_definitions(
${TARGET_NAME}
PRIVATE
DEBUG
)
endif()

if (ENABLE_TIMING)
target_compile_definitions(
${TARGET_NAME}
PRIVATE
MONODROID_TIMING
)
endif()

target_compile_options(
${TARGET_NAME}
PRIVATE
MONODROID_TIMING
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_ARGS}
)
endif()

target_compile_options(
${XAMARIN_MONO_ANDROID_LIB}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_ARGS}
)

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB} BEFORE
PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/include
${EXTERNAL_DIR}
${ROBIN_MAP_DIR}/include
)
target_include_directories(
${TARGET_NAME} BEFORE
PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/include
${EXTERNAL_DIR}
${ROBIN_MAP_DIR}/include
)

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
PRIVATE
${NET_RUNTIME_DIR}/native
)
target_link_directories(
${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
${XAMARIN_MONO_ANDROID_LIB}
${LINK_LIBS}
xa::xamarin-app
${SHARED_LIB_NAME}
xa::runtime-base
xa::java-interop
xa::lz4
-lmonosgen-2.0
-llog
)
target_link_libraries(
${TARGET_NAME}
${LINK_LIBS}
xa::xamarin-app
${SHARED_LIB_NAME}
xa::runtime-base
xa::java-interop
xa::pinvoke-override-precompiled
xa::lz4
-lmonosgen-2.0
-llog
)
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()
3 changes: 2 additions & 1 deletion src/native/monodroid/embedded-assemblies.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
close (fd);
}

if (MonodroidRuntime::is_startup_in_progress ()) {
if (MonodroidState::is_startup_in_progress ()) {
file.data = static_cast<uint8_t*>(map_info.area);
} else {
uint8_t *expected_null = nullptr;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

grendello
merged 6 commits into

from

Jul 24, 2024
 Merged


Native runtime reorganization
#9113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5c0f844

Move native stuff around


grendello Jul 16, 2024
74f30ce

Fix p/invoke tables generator script


grendello Jul 16, 2024
79bd0b6

Update the list of p/invokes, slight generated code changes


grendello Jul 16, 2024
4347b0e

Formatting


grendello Jul 16, 2024
add253c

Adjust after rebase


grendello Jul 22, 2024
c7fc926

Fix post-rebase issues


grendello Jul 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
build-tools/scripts/generate-pinvoke-tables.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down

3 changes: 2 additions & 1 deletion
src/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
 add_subdirectory(xamarin-debug-app-helper)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/java-interop/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
 ${XA_COMMON_CXX_ARGS}
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

1 change: 1 addition & 0 deletions
src/native/libstub/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/lz4/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
 "$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

167 changes: 93 additions & 74 deletions
src/native/monodroid/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
 # Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
 set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
 set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
 set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
 debug-constants.cc
 debug.cc
 embedded-assemblies-zip.cc
 embedded-assemblies.cc
 globals.cc
 internal-pinvokes.cc
 jni-remapping.cc
 mono-log-adapter.cc
 monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
 osbridge.cc
 pinvoke-override-api.cc
 runtime-util.cc
 timing.cc
 timezones.cc
 timing-internal.cc
 xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
 SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 NO_INLINE
if(BUILD_STATIC_LIBRARY)
 add_library(
 ${XAMARIN_MONO_ANDROID_STATIC_LIB}
 STATIC
 ${XAMARIN_MONODROID_SOURCES}
 )
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
 )
endif()

if (ENABLE_TIMING)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 if(DONT_INLINE)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 NO_INLINE
 )
 endif()

 if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 )
 endif()

 if (ENABLE_TIMING)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 )
 endif()

 target_compile_options(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
 )
endif()

target_compile_options(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
)

target_include_directories(
 ${XAMARIN_MONO_ANDROID_LIB} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
)
 target_include_directories(
 ${TARGET_NAME} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
 )

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
 SYSTEM PRIVATE
 ${SYSROOT_CXX_INCLUDE_DIR}
 ${MONO_RUNTIME_INCLUDE_DIR}
 ${NATIVE_TRACING_INCLUDE_DIRS}
 ${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
 ${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${NET_RUNTIME_DIR}/native
)
target_link_directories(
 ${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_LINKER_ARGS}
 ${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
 ${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::lz4
 -lmonosgen-2.0
 -llog
)
 target_link_libraries(
 ${TARGET_NAME}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::pinvoke-override-precompiled
 xa::lz4
 -lmonosgen-2.0
 -llog
 )
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
 lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
 xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()

3 changes: 2 additions & 1 deletion
src/native/monodroid/embedded-assemblies.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
 close (fd);
	}

	if (MonodroidRuntime::is_startup_in_progress ()) {
	if (MonodroidState::is_startup_in_progress ()) {
 file.data = static_cast<uint8_t*>(map_info.area);
	} else {
 uint8_t *expected_null = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

grendello
merged 6 commits into

from

Jul 24, 2024
 Merged


Native runtime reorganization
#9113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5c0f844

Move native stuff around


grendello Jul 16, 2024
74f30ce

Fix p/invoke tables generator script


grendello Jul 16, 2024
79bd0b6

Update the list of p/invokes, slight generated code changes


grendello Jul 16, 2024
4347b0e

Formatting


grendello Jul 16, 2024
add253c

Adjust after rebase


grendello Jul 22, 2024
c7fc926

Fix post-rebase issues


grendello Jul 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
build-tools/scripts/generate-pinvoke-tables.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down

3 changes: 2 additions & 1 deletion
src/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
 add_subdirectory(xamarin-debug-app-helper)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/java-interop/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
 ${XA_COMMON_CXX_ARGS}
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

1 change: 1 addition & 0 deletions
src/native/libstub/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/lz4/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
 "$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

167 changes: 93 additions & 74 deletions
src/native/monodroid/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
 # Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
 set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
 set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
 set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
 debug-constants.cc
 debug.cc
 embedded-assemblies-zip.cc
 embedded-assemblies.cc
 globals.cc
 internal-pinvokes.cc
 jni-remapping.cc
 mono-log-adapter.cc
 monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
 osbridge.cc
 pinvoke-override-api.cc
 runtime-util.cc
 timing.cc
 timezones.cc
 timing-internal.cc
 xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
 SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 NO_INLINE
if(BUILD_STATIC_LIBRARY)
 add_library(
 ${XAMARIN_MONO_ANDROID_STATIC_LIB}
 STATIC
 ${XAMARIN_MONODROID_SOURCES}
 )
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
 )
endif()

if (ENABLE_TIMING)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 if(DONT_INLINE)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 NO_INLINE
 )
 endif()

 if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 )
 endif()

 if (ENABLE_TIMING)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 )
 endif()

 target_compile_options(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
 )
endif()

target_compile_options(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
)

target_include_directories(
 ${XAMARIN_MONO_ANDROID_LIB} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
)
 target_include_directories(
 ${TARGET_NAME} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
 )

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
 SYSTEM PRIVATE
 ${SYSROOT_CXX_INCLUDE_DIR}
 ${MONO_RUNTIME_INCLUDE_DIR}
 ${NATIVE_TRACING_INCLUDE_DIRS}
 ${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
 ${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${NET_RUNTIME_DIR}/native
)
target_link_directories(
 ${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_LINKER_ARGS}
 ${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
 ${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::lz4
 -lmonosgen-2.0
 -llog
)
 target_link_libraries(
 ${TARGET_NAME}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::pinvoke-override-precompiled
 xa::lz4
 -lmonosgen-2.0
 -llog
 )
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
 lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
 xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()

3 changes: 2 additions & 1 deletion
src/native/monodroid/embedded-assemblies.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
 close (fd);
	}

	if (MonodroidRuntime::is_startup_in_progress ()) {
	if (MonodroidState::is_startup_in_progress ()) {
 file.data = static_cast<uint8_t*>(map_info.area);
	} else {
 uint8_t *expected_null = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

grendello
merged 6 commits into

from

Jul 24, 2024
 Merged


Native runtime reorganization
#9113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5c0f844

Move native stuff around


grendello Jul 16, 2024
74f30ce

Fix p/invoke tables generator script


grendello Jul 16, 2024
79bd0b6

Update the list of p/invokes, slight generated code changes


grendello Jul 16, 2024
4347b0e

Formatting


grendello Jul 16, 2024
add253c

Adjust after rebase


grendello Jul 22, 2024
c7fc926

Fix post-rebase issues


grendello Jul 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
build-tools/scripts/generate-pinvoke-tables.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down

3 changes: 2 additions & 1 deletion
src/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
 add_subdirectory(xamarin-debug-app-helper)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/java-interop/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
 ${XA_COMMON_CXX_ARGS}
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

1 change: 1 addition & 0 deletions
src/native/libstub/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/lz4/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
 "$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

167 changes: 93 additions & 74 deletions
src/native/monodroid/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
 # Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
 set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
 set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
 set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
 debug-constants.cc
 debug.cc
 embedded-assemblies-zip.cc
 embedded-assemblies.cc
 globals.cc
 internal-pinvokes.cc
 jni-remapping.cc
 mono-log-adapter.cc
 monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
 osbridge.cc
 pinvoke-override-api.cc
 runtime-util.cc
 timing.cc
 timezones.cc
 timing-internal.cc
 xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
 SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 NO_INLINE
if(BUILD_STATIC_LIBRARY)
 add_library(
 ${XAMARIN_MONO_ANDROID_STATIC_LIB}
 STATIC
 ${XAMARIN_MONODROID_SOURCES}
 )
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
 )
endif()

if (ENABLE_TIMING)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 if(DONT_INLINE)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 NO_INLINE
 )
 endif()

 if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 )
 endif()

 if (ENABLE_TIMING)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 )
 endif()

 target_compile_options(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
 )
endif()

target_compile_options(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
)

target_include_directories(
 ${XAMARIN_MONO_ANDROID_LIB} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
)
 target_include_directories(
 ${TARGET_NAME} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
 )

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
 SYSTEM PRIVATE
 ${SYSROOT_CXX_INCLUDE_DIR}
 ${MONO_RUNTIME_INCLUDE_DIR}
 ${NATIVE_TRACING_INCLUDE_DIRS}
 ${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
 ${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${NET_RUNTIME_DIR}/native
)
target_link_directories(
 ${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_LINKER_ARGS}
 ${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
 ${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::lz4
 -lmonosgen-2.0
 -llog
)
 target_link_libraries(
 ${TARGET_NAME}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::pinvoke-override-precompiled
 xa::lz4
 -lmonosgen-2.0
 -llog
 )
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
 lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
 xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()

3 changes: 2 additions & 1 deletion
src/native/monodroid/embedded-assemblies.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
 close (fd);
	}

	if (MonodroidRuntime::is_startup_in_progress ()) {
	if (MonodroidState::is_startup_in_progress ()) {
 file.data = static_cast<uint8_t*>(map_info.area);
	} else {
 uint8_t *expected_null = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

grendello
merged 6 commits into

from

Jul 24, 2024
 Merged


Native runtime reorganization
#9113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5c0f844

Move native stuff around


grendello Jul 16, 2024
74f30ce

Fix p/invoke tables generator script


grendello Jul 16, 2024
79bd0b6

Update the list of p/invokes, slight generated code changes


grendello Jul 16, 2024
4347b0e

Formatting


grendello Jul 16, 2024
add253c

Adjust after rebase


grendello Jul 22, 2024
c7fc926

Fix post-rebase issues


grendello Jul 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
build-tools/scripts/generate-pinvoke-tables.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down

3 changes: 2 additions & 1 deletion
src/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
 add_subdirectory(xamarin-debug-app-helper)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/java-interop/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
 ${XA_COMMON_CXX_ARGS}
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

1 change: 1 addition & 0 deletions
src/native/libstub/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/lz4/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
 "$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

167 changes: 93 additions & 74 deletions
src/native/monodroid/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
 # Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
 set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
 set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
 set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
 debug-constants.cc
 debug.cc
 embedded-assemblies-zip.cc
 embedded-assemblies.cc
 globals.cc
 internal-pinvokes.cc
 jni-remapping.cc
 mono-log-adapter.cc
 monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
 osbridge.cc
 pinvoke-override-api.cc
 runtime-util.cc
 timing.cc
 timezones.cc
 timing-internal.cc
 xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
 SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 NO_INLINE
if(BUILD_STATIC_LIBRARY)
 add_library(
 ${XAMARIN_MONO_ANDROID_STATIC_LIB}
 STATIC
 ${XAMARIN_MONODROID_SOURCES}
 )
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
 )
endif()

if (ENABLE_TIMING)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 if(DONT_INLINE)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 NO_INLINE
 )
 endif()

 if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 )
 endif()

 if (ENABLE_TIMING)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 )
 endif()

 target_compile_options(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
 )
endif()

target_compile_options(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
)

target_include_directories(
 ${XAMARIN_MONO_ANDROID_LIB} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
)
 target_include_directories(
 ${TARGET_NAME} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
 )

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
 SYSTEM PRIVATE
 ${SYSROOT_CXX_INCLUDE_DIR}
 ${MONO_RUNTIME_INCLUDE_DIR}
 ${NATIVE_TRACING_INCLUDE_DIRS}
 ${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
 ${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${NET_RUNTIME_DIR}/native
)
target_link_directories(
 ${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_LINKER_ARGS}
 ${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
 ${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::lz4
 -lmonosgen-2.0
 -llog
)
 target_link_libraries(
 ${TARGET_NAME}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::pinvoke-override-precompiled
 xa::lz4
 -lmonosgen-2.0
 -llog
 )
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
 lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
 xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()

3 changes: 2 additions & 1 deletion
src/native/monodroid/embedded-assemblies.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
 close (fd);
	}

	if (MonodroidRuntime::is_startup_in_progress ()) {
	if (MonodroidState::is_startup_in_progress ()) {
 file.data = static_cast<uint8_t*>(map_info.area);
	} else {
 uint8_t *expected_null = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

grendello
merged 6 commits into

from

Jul 24, 2024
 Merged


Native runtime reorganization
#9113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5c0f844

Move native stuff around


grendello Jul 16, 2024
74f30ce

Fix p/invoke tables generator script


grendello Jul 16, 2024
79bd0b6

Update the list of p/invokes, slight generated code changes


grendello Jul 16, 2024
4347b0e

Formatting


grendello Jul 16, 2024
add253c

Adjust after rebase


grendello Jul 22, 2024
c7fc926

Fix post-rebase issues


grendello Jul 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
build-tools/scripts/generate-pinvoke-tables.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down

3 changes: 2 additions & 1 deletion
src/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
 add_subdirectory(xamarin-debug-app-helper)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/java-interop/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
 ${XA_COMMON_CXX_ARGS}
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

1 change: 1 addition & 0 deletions
src/native/libstub/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/lz4/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
 "$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

167 changes: 93 additions & 74 deletions
src/native/monodroid/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
 # Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
 set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
 set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
 set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
 debug-constants.cc
 debug.cc
 embedded-assemblies-zip.cc
 embedded-assemblies.cc
 globals.cc
 internal-pinvokes.cc
 jni-remapping.cc
 mono-log-adapter.cc
 monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
 osbridge.cc
 pinvoke-override-api.cc
 runtime-util.cc
 timing.cc
 timezones.cc
 timing-internal.cc
 xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
 SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 NO_INLINE
if(BUILD_STATIC_LIBRARY)
 add_library(
 ${XAMARIN_MONO_ANDROID_STATIC_LIB}
 STATIC
 ${XAMARIN_MONODROID_SOURCES}
 )
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
 )
endif()

if (ENABLE_TIMING)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 if(DONT_INLINE)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 NO_INLINE
 )
 endif()

 if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 )
 endif()

 if (ENABLE_TIMING)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 )
 endif()

 target_compile_options(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
 )
endif()

target_compile_options(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
)

target_include_directories(
 ${XAMARIN_MONO_ANDROID_LIB} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
)
 target_include_directories(
 ${TARGET_NAME} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
 )

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
 SYSTEM PRIVATE
 ${SYSROOT_CXX_INCLUDE_DIR}
 ${MONO_RUNTIME_INCLUDE_DIR}
 ${NATIVE_TRACING_INCLUDE_DIRS}
 ${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
 ${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${NET_RUNTIME_DIR}/native
)
target_link_directories(
 ${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_LINKER_ARGS}
 ${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
 ${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::lz4
 -lmonosgen-2.0
 -llog
)
 target_link_libraries(
 ${TARGET_NAME}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::pinvoke-override-precompiled
 xa::lz4
 -lmonosgen-2.0
 -llog
 )
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
 lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
 xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()

3 changes: 2 additions & 1 deletion
src/native/monodroid/embedded-assemblies.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
 close (fd);
	}

	if (MonodroidRuntime::is_startup_in_progress ()) {
	if (MonodroidState::is_startup_in_progress ()) {
 file.data = static_cast<uint8_t*>(map_info.area);
	} else {
 uint8_t *expected_null = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

grendello
merged 6 commits into

from

Jul 24, 2024
 Merged


Native runtime reorganization
#9113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5c0f844

Move native stuff around


grendello Jul 16, 2024
74f30ce

Fix p/invoke tables generator script


grendello Jul 16, 2024
79bd0b6

Update the list of p/invokes, slight generated code changes


grendello Jul 16, 2024
4347b0e

Formatting


grendello Jul 16, 2024
add253c

Adjust after rebase


grendello Jul 22, 2024
c7fc926

Fix post-rebase issues


grendello Jul 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
build-tools/scripts/generate-pinvoke-tables.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down

3 changes: 2 additions & 1 deletion
src/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
 add_subdirectory(xamarin-debug-app-helper)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/java-interop/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
 ${XA_COMMON_CXX_ARGS}
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

1 change: 1 addition & 0 deletions
src/native/libstub/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/lz4/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
 "$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

167 changes: 93 additions & 74 deletions
src/native/monodroid/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
 # Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
 set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
 set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
 set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
 debug-constants.cc
 debug.cc
 embedded-assemblies-zip.cc
 embedded-assemblies.cc
 globals.cc
 internal-pinvokes.cc
 jni-remapping.cc
 mono-log-adapter.cc
 monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
 osbridge.cc
 pinvoke-override-api.cc
 runtime-util.cc
 timing.cc
 timezones.cc
 timing-internal.cc
 xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
 SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 NO_INLINE
if(BUILD_STATIC_LIBRARY)
 add_library(
 ${XAMARIN_MONO_ANDROID_STATIC_LIB}
 STATIC
 ${XAMARIN_MONODROID_SOURCES}
 )
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
 )
endif()

if (ENABLE_TIMING)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 if(DONT_INLINE)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 NO_INLINE
 )
 endif()

 if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 )
 endif()

 if (ENABLE_TIMING)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 )
 endif()

 target_compile_options(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
 )
endif()

target_compile_options(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
)

target_include_directories(
 ${XAMARIN_MONO_ANDROID_LIB} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
)
 target_include_directories(
 ${TARGET_NAME} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
 )

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
 SYSTEM PRIVATE
 ${SYSROOT_CXX_INCLUDE_DIR}
 ${MONO_RUNTIME_INCLUDE_DIR}
 ${NATIVE_TRACING_INCLUDE_DIRS}
 ${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
 ${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${NET_RUNTIME_DIR}/native
)
target_link_directories(
 ${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_LINKER_ARGS}
 ${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
 ${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::lz4
 -lmonosgen-2.0
 -llog
)
 target_link_libraries(
 ${TARGET_NAME}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::pinvoke-override-precompiled
 xa::lz4
 -lmonosgen-2.0
 -llog
 )
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
 lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
 xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()

3 changes: 2 additions & 1 deletion
src/native/monodroid/embedded-assemblies.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
 close (fd);
	}

	if (MonodroidRuntime::is_startup_in_progress ()) {
	if (MonodroidState::is_startup_in_progress ()) {
 file.data = static_cast<uint8_t*>(map_info.area);
	} else {
 uint8_t *expected_null = nullptr;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Native runtime reorganization#9113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

grendello
merged 6 commits into

from

Jul 24, 2024
 Merged


Native runtime reorganization
#9113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
5c0f844

Move native stuff around


grendello Jul 16, 2024
74f30ce

Fix p/invoke tables generator script


grendello Jul 16, 2024
79bd0b6

Update the list of p/invokes, slight generated code changes


grendello Jul 16, 2024
4347b0e

Formatting


grendello Jul 16, 2024
add253c

Adjust after rebase


grendello Jul 22, 2024
c7fc926

Fix post-rebase issues


grendello Jul 23, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
build-tools/scripts/generate-pinvoke-tables.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ MY_DIR="$(dirname $0)"
HOST="$(uname | tr A-Z a-z)"

NATIVE_DIR="${MY_DIR}/../../src/native"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/monodroid"
MONODROID_SOURCE_DIR="${NATIVE_DIR}/pinvoke-override"
GENERATOR_SOURCE="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables.cc"
GENERATOR_BINARY="${MONODROID_SOURCE_DIR}/generate-pinvoke-tables"
TARGET_FILE="${MONODROID_SOURCE_DIR}/pinvoke-tables.include"
Expand Down

3 changes: 2 additions & 1 deletion
src/native/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -145,7 +145,7 @@ file(REAL_PATH "../../" REPO_ROOT_DIR)
set(EXTERNAL_DIR "${REPO_ROOT_DIR}/external")
set(JAVA_INTEROP_SRC_PATH "${EXTERNAL_DIR}/Java.Interop/src/java-interop")
set(LIBUNWIND_SOURCE_DIR "${EXTERNAL_DIR}/libunwind")

set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")

#
# Include directories
Expand DownExpand Up@@ -449,6 +449,7 @@ add_subdirectory(java-interop)
add_subdirectory(xamarin-app-stub)
add_subdirectory(runtime-base)
add_subdirectory(tracing)
add_subdirectory(pinvoke-override)

if(DEBUG_BUILD)
 add_subdirectory(xamarin-debug-app-helper)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/java-interop/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,10 +37,12 @@ target_compile_options(
 ${XA_COMMON_CXX_ARGS}
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

1 change: 1 addition & 0 deletions
src/native/libstub/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ endmacro()

xa_add_stub_library(c)
xa_add_stub_library(m)
xa_add_stub_library(z)

# These two are used by the marshal methods tracing library when linking libxamarin-app.so
xa_add_stub_library(log)
Expand Down

12 changes: 7 additions & 5 deletions
src/native/lz4/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -30,10 +30,12 @@ target_include_directories(
 "$<BUILD_INTERFACE:${LZ4_INCLUDE_DIR}>"
)

set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
)
if(DEBUG_BUILD)
 set_target_properties(
 ${LIB_NAME}
 PROPERTIES
 ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
 )
endif()

xa_add_compile_definitions(${LIB_NAME})

167 changes: 93 additions & 74 deletions
src/native/monodroid/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ include(CheckCXXSymbolExists)
# Paths

set(BIONIC_SOURCES_DIR "${REPO_ROOT_DIR}/src-ThirdParty/bionic")
set(ROBIN_MAP_DIR "${EXTERNAL_DIR}/robin-map")
set(BUILD_STATIC_LIBRARY OFF)

if(DEBUG_BUILD)
 # Convince NDK to really optimize our Debug builds. Without this, NDK's cmake toolchain definition
Expand All@@ -17,6 +17,8 @@ if(DEBUG_BUILD)
 set(XA_COMPILER_FLAGS_DEBUG "-fno-limit-debug-info -O2")
 set(CMAKE_C_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
 set(CMAKE_CXX_FLAGS_DEBUG ${XA_COMPILER_FLAGS_DEBUG})
elseif(NOT ANALYZERS_ENABLED)
 set(BUILD_STATIC_LIBRARY ON)
endif()

# Library directories
Expand All@@ -42,13 +44,15 @@ endif()
# Sources
string(TOLOWER ${CMAKE_BUILD_TYPE} XAMARIN_MONO_ANDROID_SUFFIX)
set(XAMARIN_MONO_ANDROID_LIB "mono-android${CHECKED_BUILD_INFIX}.${XAMARIN_MONO_ANDROID_SUFFIX}")
set(XAMARIN_MONO_ANDROID_STATIC_LIB "${XAMARIN_MONO_ANDROID_LIB}-static")

set(XAMARIN_MONODROID_SOURCES
 debug-constants.cc
 debug.cc
 embedded-assemblies-zip.cc
 embedded-assemblies.cc
 globals.cc
 internal-pinvokes.cc
 jni-remapping.cc
 mono-log-adapter.cc
 monodroid-glue.cc
Expand All@@ -58,9 +62,7 @@ set(XAMARIN_MONODROID_SOURCES
 osbridge.cc
 pinvoke-override-api.cc
 runtime-util.cc
 timing.cc
 timezones.cc
 timing-internal.cc
 xamarin_getifaddrs.cc
)

Expand DownExpand Up@@ -93,90 +95,107 @@ add_library(
 SHARED ${XAMARIN_MONODROID_SOURCES}
)

target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
)

if(DONT_INLINE)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 NO_INLINE
if(BUILD_STATIC_LIBRARY)
 add_library(
 ${XAMARIN_MONO_ANDROID_STATIC_LIB}
 STATIC
 ${XAMARIN_MONODROID_SOURCES}
 )
endif()

if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
macro(lib_target_options TARGET_NAME)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 HAVE_CONFIG_H
 HAVE_LZ4
 JI_DLL_EXPORT
 JI_NO_VISIBILITY
 MONO_DLL_EXPORT
 NET
 TSL_NO_EXCEPTIONS
 )
endif()

if (ENABLE_TIMING)
 target_compile_definitions(
 ${XAMARIN_MONO_ANDROID_LIB}
 if(DONT_INLINE)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 NO_INLINE
 )
 endif()

 if(DEBUG_BUILD AND NOT DISABLE_DEBUG)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 DEBUG
 )
 endif()

 if (ENABLE_TIMING)
 target_compile_definitions(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 )
 endif()

 target_compile_options(
 ${TARGET_NAME}
 PRIVATE
 MONODROID_TIMING
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
 )
endif()

target_compile_options(
 ${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_ARGS}
)

target_include_directories(
 ${XAMARIN_MONO_ANDROID_LIB} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
)
 target_include_directories(
 ${TARGET_NAME} BEFORE
 PRIVATE
 ${CMAKE_CURRENT_BINARY_DIR}/include
 ${EXTERNAL_DIR}
 ${ROBIN_MAP_DIR}/include
 )

target_include_directories(
${XAMARIN_MONO_ANDROID_LIB}
 SYSTEM PRIVATE
 ${SYSROOT_CXX_INCLUDE_DIR}
 ${MONO_RUNTIME_INCLUDE_DIR}
 ${NATIVE_TRACING_INCLUDE_DIRS}
 ${LIBUNWIND_INCLUDE_DIRS}
)
target_include_directories(
 ${TARGET_NAME}
SYSTEM PRIVATE
${SYSROOT_CXX_INCLUDE_DIR}
${MONO_RUNTIME_INCLUDE_DIR}
${NATIVE_TRACING_INCLUDE_DIRS}
${LIBUNWIND_INCLUDE_DIRS}
)

target_link_directories(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${NET_RUNTIME_DIR}/native
)
target_link_directories(
 ${TARGET_NAME}
PRIVATE
${NET_RUNTIME_DIR}/native
)

target_link_options(
${XAMARIN_MONO_ANDROID_LIB}
 PRIVATE
 ${XA_DEFAULT_SYMBOL_VISIBILITY}
 ${XA_COMMON_CXX_LINKER_ARGS}
 ${XA_CXX_DSO_LINKER_ARGS}
)
target_link_options(
 ${TARGET_NAME}
PRIVATE
${XA_DEFAULT_SYMBOL_VISIBILITY}
${XA_COMMON_CXX_LINKER_ARGS}
${XA_CXX_DSO_LINKER_ARGS}
)

target_link_libraries(
 ${XAMARIN_MONO_ANDROID_LIB}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::lz4
 -lmonosgen-2.0
 -llog
)
 target_link_libraries(
 ${TARGET_NAME}
 ${LINK_LIBS}
 xa::xamarin-app
 ${SHARED_LIB_NAME}
 xa::runtime-base
 xa::java-interop
 xa::pinvoke-override-precompiled
 xa::lz4
 -lmonosgen-2.0
 -llog
 )
endmacro ()

lib_target_options(${XAMARIN_MONO_ANDROID_LIB})
xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_LIB})

if(BUILD_STATIC_LIBRARY)
 lib_target_options(${XAMARIN_MONO_ANDROID_STATIC_LIB})
 xa_add_compile_definitions(${XAMARIN_MONO_ANDROID_STATIC_LIB})
endif()

3 changes: 2 additions & 1 deletion
src/native/monodroid/embedded-assemblies.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,7 @@
#include "xamarin-app.hh"
#include "cpp-util.hh"
#include "monodroid-glue-internal.hh"
#include "monodroid-state.hh"
#include "startup-aware-lock.hh"
#include "timing-internal.hh"
#include "search.hh"
Expand DownExpand Up@@ -179,7 +180,7 @@ EmbeddedAssemblies::map_runtime_file (XamarinAndroidBundledAssembly& file) noexc
 close (fd);
	}

	if (MonodroidRuntime::is_startup_in_progress ()) {
	if (MonodroidState::is_startup_in_progress ()) {
 file.data = static_cast<uint8_t*>(map_info.area);
	} else {
 uint8_t *expected_null = nullptr;
Expand Down
Loading