diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 19c48f2ec850c..5179974d39ae3 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -206,6 +206,7 @@ + diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 2a2b7cd920d47..5ef223e0cf583 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -831,9 +831,12 @@ <_MonoRuntimeArtifacts Condition="'$(_MonoIncludeInterpStaticFiles)' == 'true'" Include="$(MonoObjDir)out\lib\libmono-ilgen.a"> $(RuntimeBinDir)libmono-ilgen.a - <_MonoRuntimeArtifacts Condition="'$(TargetsBrowser)' == 'true' and '$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(MonoObjDir)out\lib\libmono-profiler-aot.a"> + <_MonoRuntimeArtifacts Condition="('$(TargetsBrowser)' == 'true' or '$(TargetsAndroid)' == 'true') and '$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(MonoObjDir)out\lib\libmono-profiler-aot.a"> $(RuntimeBinDir)libmono-profiler-aot.a + <_MonoRuntimeArtifacts Condition="'$(TargetsAndroid)' == 'true' and '$(BuildMonoAOTCrossCompilerOnly)' != 'true'" Include="$(MonoObjDir)out\lib\libmono-profiler-aot$(SharedLibExt)"> + $(RuntimeBinDir)libmono-profiler-aot$(SharedLibExt) + <_MonoICorDebugArtifacts Condition="'$(MonoMsCorDbi)' == 'true'" Include="$(MonoObjDir)out\lib\$(LibPrefix)dbgshim$(SharedLibExt)"> $(RuntimeBinDir)$(LibPrefix)dbgshim$(SharedLibExt) diff --git a/src/mono/mono/profiler/CMakeLists.txt b/src/mono/mono/profiler/CMakeLists.txt index 784ceb0203d3d..636ff1d646541 100644 --- a/src/mono/mono/profiler/CMakeLists.txt +++ b/src/mono/mono/profiler/CMakeLists.txt @@ -24,6 +24,13 @@ if(NOT DISABLE_LIBS) install(TARGETS mono-profiler-log-static LIBRARY) endif() + if(HOST_ANDROID) + add_library(mono-profiler-aot SHARED aot.c helper.c) + target_compile_definitions(mono-profiler-aot PRIVATE -DMONO_DLL_EXPORT) + target_link_libraries(mono-profiler-aot monosgen-shared eglib_objects log) + install(TARGETS mono-profiler-aot LIBRARY) + endif() + add_library(mono-profiler-aot-static STATIC aot.c helper.c) set_target_properties(mono-profiler-aot-static PROPERTIES OUTPUT_NAME mono-profiler-aot) install(TARGETS mono-profiler-aot-static LIBRARY)