fix: adjust log profile generation

unoplatform · May 24, 2023 · ee18f51 · ee18f51
1 parent c48cd45
commit ee18f51
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/Bootstrapper.ts b/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/Bootstrapper.ts
@@ -156,9 +156,6 @@ namespace Uno.WebAssembly.Bootstrap {
  // Module may not be initialized yet (.NET 8 and later)
  (<any>this._context).Module = this._context.Module || {};
 
- this._context.Module.ENVIRONMENT_IS_WEB = Bootstrapper.ENVIRONMENT_IS_WEB;
- this._context.Module.ENVIRONMENT_IS_NODE = Bootstrapper.ENVIRONMENT_IS_NODE;
-
  this.setupRequire();
  this.setupEmscriptenPreRun();
 

diff --git a/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/LogProfilerSupport.ts b/src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/LogProfilerSupport.ts
@@ -39,7 +39,7 @@
 
  private attachHotKey() {
 
- if (this._context.Module.ENVIRONMENT_IS_WEB) {
+ if (Bootstrapper.ENVIRONMENT_IS_WEB) {
 
  if (LogProfilerSupport._logProfilerEnabled) {
  // Use the combination shift+alt+D because it isn't used by the major browsers

diff --git a/src/Uno.Wasm.Bootstrap/ts/types/dotnet/index.d.ts b/src/Uno.Wasm.Bootstrap/ts/types/dotnet/index.d.ts
@@ -56,8 +56,6 @@ declare interface EmscriptenModule {
  /**
  * BEGIN UNO SPECIFIC
  */
- ENVIRONMENT_IS_NODE: boolean;
- ENVIRONMENT_IS_WEB: boolean;
  aotProfileData: any;
  /**
  * END UNO SPECIFIC

diff --git a/src/Uno.Wasm.StaticLinking.Shared/Uno.Wasm.StaticLinking.Shared.projitems b/src/Uno.Wasm.StaticLinking.Shared/Uno.Wasm.StaticLinking.Shared.projitems
@@ -30,7 +30,7 @@
  <None Include="$(MSBuildThisFileDirectory)side_module\side.wasm" />
  <None Include="$(MSBuildThisFileDirectory)test.cpp" />
  </ItemGroup>
- <ItemGroup Condition="'$(UseAOT)'=='true' or '$(WasmShellGenerateAOTProfile)'=='true'">
+ <ItemGroup Condition="'$(UseAOT)'=='true' or '$(WasmShellGenerateAOTProfile)'=='true' or '$(WasmShellEnableLogProfiler)'=='true'">
  <Content Include="$(MSBuildThisFileDirectory)native/**/*.bc" />
  <WasmShellNativeCompile Include="$(MSBuildThisFileDirectory)test.cpp" />
  </ItemGroup>