Skip to content

Commit

Permalink
refactor(core): use latest method to instead of v8 DEPRECATED methods (…
Browse files Browse the repository at this point in the history 
…Tencent#639)
  • Loading branch information
@medns @boxizen
medns authored and boxizen committed Aug 16, 2021
1 parent 6f03640 commit 4d2d598
Show file tree
Hide file tree
Showing 11 changed files with 733 additions and 766 deletions.
2 changes: 2 additions & 0 deletions android/sdk/src/main/jni/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ message("V8_VERSION: ${V8_VERSION}")

message("JS_ENGINE:" ${JS_ENGINE})
if (${JS_ENGINE} STREQUAL "V8")
add_definitions("-DV8_IMMINENT_DEPRECATION_WARNINGS")
add_definitions("-DV8_DEPRECATION_WARNINGS")
file(GLOB_RECURSE JSC_SRC ${CORE_SRC_DIR}/src/napi/jsc/*)
message("JSC_SRC: ${JSC_SRC}")
list(REMOVE_ITEM CORE_SRC ${JSC_SRC})
Expand Down
122 changes: 59 additions & 63 deletions android/sdk/src/main/jni/HippyAndroidSdk.sln
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,59 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippyAndroidSdk", "HippyAndroidSdk.vcxproj", "{E0581439-C51A-4F6C-9ABF-D697C33333B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\..\..\core\core.vcxproj", "{33620009-97B0-440A-88C7-AF0AFD05DAD8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM.ActiveCfg = Debug|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM.Build.0 = Debug|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM.Deploy.0 = Debug|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM64.ActiveCfg = Debug|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM64.Build.0 = Debug|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x64.ActiveCfg = Debug|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x64.Build.0 = Debug|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x86.ActiveCfg = Debug|x86
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x86.Build.0 = Debug|x86
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM.ActiveCfg = Release|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM.Build.0 = Release|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM.Deploy.0 = Release|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM64.ActiveCfg = Release|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM64.Build.0 = Release|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x64.ActiveCfg = Release|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x64.Build.0 = Release|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x86.ActiveCfg = Release|x86
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x86.Build.0 = Release|x86
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM.ActiveCfg = Debug|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM.Build.0 = Debug|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM64.ActiveCfg = Debug|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM64.Build.0 = Debug|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|x64.ActiveCfg = Debug|x64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|x64.Build.0 = Debug|x64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|x86.ActiveCfg = Debug|x86
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|x86.Build.0 = Debug|x86
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM.ActiveCfg = Release|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM.Build.0 = Release|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM64.ActiveCfg = Release|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM64.Build.0 = Release|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|x64.ActiveCfg = Release|x64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|x64.Build.0 = Release|x64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|x86.ActiveCfg = Release|x86
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F20660D0-F7FD-4BDF-8ABF-B6935DA89A50}
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HippyAndroidSdk", "HippyAndroidSdk.vcxproj", "{E0581439-C51A-4F6C-9ABF-D697C33333B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\..\..\core\core.vcxproj", "{33620009-97B0-440A-88C7-AF0AFD05DAD8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM.ActiveCfg = Debug|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM.Build.0 = Debug|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM.Deploy.0 = Debug|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM64.ActiveCfg = Debug|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|ARM64.Build.0 = Debug|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x64.ActiveCfg = Debug|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x64.Build.0 = Debug|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x86.ActiveCfg = Debug|x86
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Debug|x86.Build.0 = Debug|x86
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM.ActiveCfg = Release|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM.Build.0 = Release|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM.Deploy.0 = Release|ARM
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM64.ActiveCfg = Release|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|ARM64.Build.0 = Release|ARM64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x64.ActiveCfg = Release|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x64.Build.0 = Release|x64
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x86.ActiveCfg = Release|x86
{E0581439-C51A-4F6C-9ABF-D697C33333B0}.Release|x86.Build.0 = Release|x86
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM.ActiveCfg = Debug|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM.Build.0 = Debug|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM64.ActiveCfg = Debug|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|ARM64.Build.0 = Debug|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|x64.ActiveCfg = Debug|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Debug|x86.ActiveCfg = Debug|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM.ActiveCfg = Release|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM.Build.0 = Release|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM64.ActiveCfg = Release|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|ARM64.Build.0 = Release|ARM64
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|x64.ActiveCfg = Release|ARM
{33620009-97B0-440A-88C7-AF0AFD05DAD8}.Release|x86.ActiveCfg = Release|ARM
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F20660D0-F7FD-4BDF-8ABF-B6935DA89A50}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 4d2d598

Please sign in to comment.