diff --git a/.gitmodules b/.gitmodules index f8838a54d10..53706ac5d07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,18 +26,10 @@ path = external/nrefactory url = https://github.com/xamarin/NRefactory.git branch = master -[submodule "external/opentk"] - path = external/opentk - url = https://github.com/mono/opentk.git - branch = main [submodule "external/robin-map"] path = external/robin-map url = https://github.com/Tessil/robin-map.git branch = master -[submodule "external/sqlite"] - path = external/sqlite - url = https://github.com/xamarin/sqlite.git - branch = 3.35.2 [submodule "external/xamarin-android-tools"] path = external/xamarin-android-tools url = https://github.com/xamarin/xamarin-android-tools diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index 480b25a4ca3..8894b7957b9 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -62,22 +62,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.ProjectTools", "src EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Build.Tests", "src\Xamarin.Android.Build.Tasks\Tests\Xamarin.Android.Build.Tests\Xamarin.Android.Build.Tests.csproj", "{53E4ABF0-1085-45F9-B964-DCAE4B819998}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.EnterpriseServices", "src\System.EnterpriseServices\System.EnterpriseServices.csproj", "{2868FC32-A4E7-4008-87C8-2C7879CACB58}" - ProjectSection(ProjectDependencies) = postProject - {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "class-parse", "external\Java.Interop\tools\class-parse\class-parse.csproj", "{38C762AB-8FD1-44DE-9855-26AAE7129DC3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "logcat-parse", "external\Java.Interop\tools\logcat-parse\logcat-parse.csproj", "{7387E151-48E3-4885-B2CA-A74434A34045}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sqlite-xamarin", "src\sqlite-xamarin\sqlite-xamarin.csproj", "{B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "src\OpenTK-1.0\OpenTK.csproj", "{5EB9E888-E357-417E-9F39-DDEC195CE47F}" - ProjectSection(ProjectDependencies) = postProject - {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} = {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "api-xml-adjuster", "build-tools\api-xml-adjuster\api-xml-adjuster.csproj", "{8A6CB07C-E493-4A4F-AB94-038645A27118}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Android.Tools.JavadocImporter", "src\Xamarin.Android.Tools.JavadocImporter\Xamarin.Android.Tools.JavadocImporter.csproj", "{E0890301-F75F-40E7-B008-54C28B3BA542}" @@ -252,10 +240,6 @@ Global {53E4ABF0-1085-45F9-B964-DCAE4B819998}.Debug|AnyCPU.Build.0 = Debug|Any CPU {53E4ABF0-1085-45F9-B964-DCAE4B819998}.Release|AnyCPU.ActiveCfg = Release|Any CPU {53E4ABF0-1085-45F9-B964-DCAE4B819998}.Release|AnyCPU.Build.0 = Release|Any CPU - {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU - {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Debug|AnyCPU.Build.0 = Debug|Any CPU - {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.ActiveCfg = Release|Any CPU - {2868FC32-A4E7-4008-87C8-2C7879CACB58}.Release|AnyCPU.Build.0 = Release|Any CPU {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Debug|AnyCPU.Build.0 = Debug|Any CPU {38C762AB-8FD1-44DE-9855-26AAE7129DC3}.Release|AnyCPU.ActiveCfg = Release|Any CPU @@ -264,14 +248,6 @@ Global {7387E151-48E3-4885-B2CA-A74434A34045}.Debug|AnyCPU.Build.0 = Debug|Any CPU {7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.ActiveCfg = Release|Any CPU {7387E151-48E3-4885-B2CA-A74434A34045}.Release|AnyCPU.Build.0 = Release|Any CPU - {B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU - {B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8}.Debug|AnyCPU.Build.0 = Debug|Any CPU - {B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8}.Release|AnyCPU.ActiveCfg = Release|Any CPU - {B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8}.Release|AnyCPU.Build.0 = Release|Any CPU - {5EB9E888-E357-417E-9F39-DDEC195CE47F}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU - {5EB9E888-E357-417E-9F39-DDEC195CE47F}.Debug|AnyCPU.Build.0 = Debug|Any CPU - {5EB9E888-E357-417E-9F39-DDEC195CE47F}.Release|AnyCPU.ActiveCfg = Release|Any CPU - {5EB9E888-E357-417E-9F39-DDEC195CE47F}.Release|AnyCPU.Build.0 = Release|Any CPU {8A6CB07C-E493-4A4F-AB94-038645A27118}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU {8A6CB07C-E493-4A4F-AB94-038645A27118}.Debug|AnyCPU.Build.0 = Debug|Any CPU {8A6CB07C-E493-4A4F-AB94-038645A27118}.Release|AnyCPU.ActiveCfg = Release|Any CPU @@ -300,12 +276,10 @@ Global {B8105878-D423-4159-A3E7-028298281EC6}.Debug|AnyCPU.Build.0 = Debug|Any CPU {B8105878-D423-4159-A3E7-028298281EC6}.Release|AnyCPU.ActiveCfg = Release|Any CPU {B8105878-D423-4159-A3E7-028298281EC6}.Release|AnyCPU.Build.0 = Release|Any CPU - {43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU {43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Debug|AnyCPU.Build.0 = Debug|Any CPU {43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Release|AnyCPU.ActiveCfg = Release|Any CPU {43564FB3-0F79-4FF4-A2B0-B1637072FF01}.Release|AnyCPU.Build.0 = Release|Any CPU - {3DE17662-DCD6-4F49-AF06-D39AACC8649A}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU {3DE17662-DCD6-4F49-AF06-D39AACC8649A}.Debug|AnyCPU.Build.0 = Debug|Any CPU {3DE17662-DCD6-4F49-AF06-D39AACC8649A}.Release|AnyCPU.ActiveCfg = Release|Any CPU @@ -458,11 +432,8 @@ Global {4D603AA3-3BFD-43C8-8050-0CD6C2601126} = {04E3E11E-B47D-4599-8AFC-50515A95E715} {2DD1EE75-6D8D-4653-A800-0A24367F7F38} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} {53E4ABF0-1085-45F9-B964-DCAE4B819998} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} - {2868FC32-A4E7-4008-87C8-2C7879CACB58} = {04E3E11E-B47D-4599-8AFC-50515A95E715} {38C762AB-8FD1-44DE-9855-26AAE7129DC3} = {864062D3-A415-4A6F-9324-5820237BA058} {7387E151-48E3-4885-B2CA-A74434A34045} = {864062D3-A415-4A6F-9324-5820237BA058} - {B8F799C5-D7CE-4E09-9CE6-BAA4173E7EC8} = {04E3E11E-B47D-4599-8AFC-50515A95E715} - {5EB9E888-E357-417E-9F39-DDEC195CE47F} = {04E3E11E-B47D-4599-8AFC-50515A95E715} {8A6CB07C-E493-4A4F-AB94-038645A27118} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} {E0890301-F75F-40E7-B008-54C28B3BA542} = {864062D3-A415-4A6F-9324-5820237BA058} {A87352E6-CE7F-4346-B6B1-586AE931C0A7} = {864062D3-A415-4A6F-9324-5820237BA058} diff --git a/build-tools/automation/yaml-templates/commercial-build.yaml b/build-tools/automation/yaml-templates/commercial-build.yaml index 6417eaf85c3..0284cade5f0 100644 --- a/build-tools/automation/yaml-templates/commercial-build.yaml +++ b/build-tools/automation/yaml-templates/commercial-build.yaml @@ -43,6 +43,14 @@ steps: workingDirectory: ${{ parameters.xaSourcePath }} displayName: delete legacy xamarin-android submodule +- script: rm -rf external/opentk + workingDirectory: ${{ parameters.xaSourcePath }} + displayName: delete legacy opentk submodule + +- script: rm -rf external/sqlite + workingDirectory: ${{ parameters.xaSourcePath }} + displayName: delete legacy sqlite submodule + - task: CodeQL3000Init@0 displayName: CodeQL 3000 Init condition: and(succeeded(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index 6db89aba64b..7a75176ef34 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -218,7 +218,6 @@ <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MicrosoftAndroidSdkOutDir)lib\%(Identity)\libMonoPosixHelper.d.so')" ExcludeFromAndroidNETSdk="true" /> <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MicrosoftAndroidSdkOutDir)lib\%(Identity)\libmonosgen-2.0.so')" ExcludeFromAndroidNETSdk="true" /> <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MicrosoftAndroidSdkOutDir)lib\%(Identity)\libmonosgen-2.0.d.so')" ExcludeFromAndroidNETSdk="true" /> - <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MicrosoftAndroidSdkOutDir)lib\%(Identity)\libsqlite3_xamarin.so')" ExcludeFromAndroidNETSdk="true" /> <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MicrosoftAndroidSdkOutDir)lib\%(Identity)\libxamarin-debug-app-helper.so')" ExcludeFromAndroidNETSdk="true" /> <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MicrosoftAndroidSdkOutDir)lib\%(Identity)\libxamarin-debug-app-helper-checked+asan.so')" ExcludeFromAndroidNETSdk="true" Condition=" '$(EnableNativeAnalyzers)' == 'true' " /> <_MSBuildFiles Include="@(AndroidSupportedTargetJitAbi->'$(MicrosoftAndroidSdkOutDir)lib\%(Identity)\libxamarin-debug-app-helper-checked+ubsan.so')" ExcludeFromAndroidNETSdk="true" Condition=" '$(EnableNativeAnalyzers)' == 'true' " /> diff --git a/build-tools/scripts/XAVersionInfo.targets b/build-tools/scripts/XAVersionInfo.targets index 16b1773258d..a96bcd8f4d1 100644 --- a/build-tools/scripts/XAVersionInfo.targets +++ b/build-tools/scripts/XAVersionInfo.targets @@ -16,9 +16,6 @@ <_SubmoduleBranchInfo Include="external/Java.Interop"> _BuildInfo_JavaInteropCommit - <_SubmoduleBranchInfo Include="external/sqlite"> - _BuildInfo_SqliteCommit - <_SubmoduleBranchInfo Include="external/xamarin-android-tools"> _BuildInfo_XamarinAndroidToolsCommit diff --git a/build-tools/xaprepare/xaprepare/Application/GeneratedMakeRulesFile.cs b/build-tools/xaprepare/xaprepare/Application/GeneratedMakeRulesFile.cs index 92dee458e3a..f2145cba480 100644 --- a/build-tools/xaprepare/xaprepare/Application/GeneratedMakeRulesFile.cs +++ b/build-tools/xaprepare/xaprepare/Application/GeneratedMakeRulesFile.cs @@ -151,11 +151,6 @@ void Generate (Context context, StreamWriter sw) fileToRemovePath: $"{monoFrameworksRoot}/{latestStableFramework}/Mono.Android.Export.*", projectPath: "src/Mono.Android.Export/Mono.Android.Export.csproj" ); - - WriteMSBuildCall ( - fileToRemovePath: $"{monoFrameworksRoot}/{latestStableFramework}/OpenTK-1.0.*", - projectPath: "src/OpenTK-1.0/OpenTK.csproj" - ); sw.WriteLine (); if (context.RuleGenerators == null || context.RuleGenerators.Count == 0) diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/opentk.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/opentk.cs deleted file mode 100644 index 289d438a37f..00000000000 --- a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/opentk.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; - -namespace Xamarin.Android.Prepare -{ - [TPN] - class opentk_mono_opentk_TPN : ThirdPartyNotice - { - static readonly Uri url = new Uri ("https://github.com/mono/opentk/"); - static readonly string licenseFile = Path.Combine ("external", "opentk", "Documentation", "License.txt"); - - public override string LicenseFile => licenseFile; - public override string Name => "mono/opentk"; - public override Uri SourceUrl => url; - public override string LicenseText => String.Empty; - - public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeExternalDeps; - } -} diff --git a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/sqlite.cs b/build-tools/xaprepare/xaprepare/ThirdPartyNotices/sqlite.cs deleted file mode 100644 index 4d4ac0ab64b..00000000000 --- a/build-tools/xaprepare/xaprepare/ThirdPartyNotices/sqlite.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; - -namespace Xamarin.Android.Prepare -{ - [TPN] - class sqlite_xamarin_sqlite_TPN : ThirdPartyNotice - { - static readonly Uri url = new Uri ("https://github.com/xamarin/sqlite/"); - - public override string LicenseFile => CommonLicenses.Apache20Path; - public override string Name => "xamarin/sqlite"; - public override Uri SourceUrl => url; - public override string LicenseText => String.Empty; - - public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeExternalDeps; - } - - [TPN] - class sqlite_sqlite_sqlite_TPN : ThirdPartyNotice - { - static readonly Uri url = new Uri ("https://github.com/xamarin/sqlite/tree/master/dist/"); - static readonly string licenseFile = Path.Combine ("external", "sqlite", "dist", "NOTICE"); - - public override string LicenseFile => licenseFile; - public override string Name => "sqlite/sqlite"; - public override Uri SourceUrl => url; - public override string LicenseText => String.Empty; - - public override bool Include (bool includeExternalDeps, bool includeBuildDeps) => includeExternalDeps; - } -} diff --git a/external/opentk b/external/opentk deleted file mode 160000 index daa9b2d577d..00000000000 --- a/external/opentk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit daa9b2d577d398c95ca4014dd92c2a55fa67dcf5 diff --git a/external/sqlite b/external/sqlite deleted file mode 160000 index 68c69d8ad15..00000000000 --- a/external/sqlite +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 68c69d8ad15c8c2f17c4b90518ec75ba58226d16 diff --git a/src/System.EnterpriseServices/Properties/AssemblyInfo.cs b/src/System.EnterpriseServices/Properties/AssemblyInfo.cs deleted file mode 100644 index 3203794e679..00000000000 --- a/src/System.EnterpriseServices/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("System.EnterpriseServices")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("2.0.5")] -[assembly: AssemblyFileVersion("2.0.5")] - -#if SIGN_ASSEMBLY -[assembly: AssemblyKeyFile(@"../../../OpenTK.snk")] -#endif diff --git a/src/System.EnterpriseServices/System.EnterpriseServices.csproj b/src/System.EnterpriseServices/System.EnterpriseServices.csproj deleted file mode 100644 index a3413aa590b..00000000000 --- a/src/System.EnterpriseServices/System.EnterpriseServices.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - false - - - \ No newline at end of file diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Legacy.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Legacy.targets index 800cabe865b..97e8d06aa43 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Legacy.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Legacy.targets @@ -526,7 +526,6 @@ projects. .NET 5 projects will not import this file. <_TargetArchitecture Include="$(_Android32bitArchitectures);$(_Android64bitArchitectures)" /> <_TargetLibDir Include="$(MSBuildThisFileDirectory)lib\%(_TargetArchitecture.Identity)" Condition=" Exists('$(MSBuildThisFileDirectory)lib\%(_TargetArchitecture.Identity)') "/> <_TargetLibInterpreterDir Include="$(MSBuildThisFileDirectory)lib\$(_TargetInterpreterPrefix)%(_TargetArchitecture.Identity)" Condition=" Exists('$(MSBuildThisFileDirectory)lib\$(_TargetInterpreterPrefix)%(_TargetArchitecture.Identity)') "/> - diff --git a/src/sqlite-xamarin/.gitignore b/src/sqlite-xamarin/.gitignore deleted file mode 100644 index 3d8a7ca8449..00000000000 --- a/src/sqlite-xamarin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -sources.projitems diff --git a/src/sqlite-xamarin/CMakeLists.txt b/src/sqlite-xamarin/CMakeLists.txt deleted file mode 100644 index d4db6421b40..00000000000 --- a/src/sqlite-xamarin/CMakeLists.txt +++ /dev/null @@ -1,81 +0,0 @@ -cmake_minimum_required(VERSION 3.18.1) - -# -# MUST be included before project()! -# -include("../../build-tools/cmake/xa_common.cmake") - -project(libsqlite-xamarin C) - -include(CheckIncludeFiles) -include("../../build-tools/cmake/xa_macros.cmake") - -if(NOT DEFINED SQLITE_LIBRARY_NAME) - message(FATAL_ERROR "Please set the SQLITE_LIBRARY_NAME variable on command line (-DSQLITE_LIBRARY_NAME=base_library_name)") -endif() - -if(NOT DEFINED SQLITE_SOURCE_DIR) - message(FATAL_ERROR "Please set the SQLITE_SOURCE_DIR variable on command line (-DSQLITE_SOURCE_DIR=source_dir_path)") -endif() - -if(NOT DEFINED SQLITE_OUTPUT_DIR) - message(FATAL_ERROR "Please set the SQLITE_OUTPUT_DIR variable on command line (-DSQLITE_OUTPUT_DIR=output_dir_path)") -endif() - -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SQLITE_OUTPUT_DIR}) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SQLITE_OUTPUT_DIR}) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SQLITE_OUTPUT_DIR}) - -add_compile_definitions(__ANDROID_API__=${ANDROID_NATIVE_API_LEVEL}) -add_compile_definitions(NO_ANDROID_FUNCS=1) -add_compile_definitions(NDEBUG=1) -add_compile_definitions(HAVE_USLEEP=1) -add_compile_definitions(SQLITE_HAVE_ISNAN) -add_compile_definitions(SQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576) -add_compile_definitions(SQLITE_THREADSAFE=2) -add_compile_definitions(SQLITE_TEMP_STORE=3) -add_compile_definitions(SQLITE_POWERSAFE_OVERWRITE=1) -add_compile_definitions(SQLITE_DEFAULT_FILE_FORMAT=4) -add_compile_definitions(SQLITE_DEFAULT_AUTOVACUUM=1) -add_compile_definitions(SQLITE_ENABLE_MEMORY_MANAGEMENT=1) -add_compile_definitions(SQLITE_ENABLE_FTS3) -add_compile_definitions(SQLITE_ENABLE_FTS3_BACKWARDS) -add_compile_definitions(SQLITE_ENABLE_FTS4) -add_compile_definitions(SQLITE_OMIT_BUILTIN_TEST) -add_compile_definitions(SQLITE_OMIT_COMPILEOPTION_DIAGS) -add_compile_definitions(SQLITE_OMIT_LOAD_EXTENSION) -add_compile_definitions(SQLITE_DEFAULT_FILE_PERMISSIONS=0600) -add_compile_definitions(SQLITE_SECURE_DELETE) -add_compile_definitions(SQLITE_ENABLE_BATCH_ATOMIC_WRITE) -add_compile_definitions(BIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD) -add_compile_definitions(HAVE_MALLOC_H=1) -add_compile_definitions(USE_PREAD64) -add_compile_definitions(fdatasync=fdatasync) - -if(ANDROID_NATIVE_API_LEVEL GREATER_EQUAL 17) - add_compile_definitions(HAVE_MALLOC_USABLE_SIZE) -endif() - -set(DSO_SYMBOL_VISIBILITY "default") -xa_common_prepare() - -# Don't put the leading '-' in options -set(LOCAL_COMPILER_ARGS "") - -if(CMAKE_BUILD_TYPE STREQUAL Debug) - list(APPEND LOCAL_COMPILER_ARGS -g -fno-omit-frame-pointer) -else() - list(APPEND LOCAL_COMPILER_ARGS -s -fomit-frame-pointer) -endif() - -xa_check_c_flags(XA_C_FLAGS "${LOCAL_COMPILER_ARGS}") -xa_check_c_linker_flags(XA_C_LINKER_FLAGS "${LOCAL_COMPILER_ARGS}") - -add_compile_options(${XA_C_FLAGS}) -add_link_options(${XA_C_LINKER_FLAGS}) - -file(TO_CMAKE_PATH "${SQLITE_SOURCE_DIR}/dist/sqlite3.c" SQLITE_XAMARIN_SOURCES) - -add_library(${SQLITE_LIBRARY_NAME} SHARED ${SQLITE_XAMARIN_SOURCES}) - -target_link_libraries(${SQLITE_LIBRARY_NAME} -ldl -llog) diff --git a/src/sqlite-xamarin/Mono.Data.Sqlite.dll.config b/src/sqlite-xamarin/Mono.Data.Sqlite.dll.config deleted file mode 100644 index 5e01176193d..00000000000 --- a/src/sqlite-xamarin/Mono.Data.Sqlite.dll.config +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/sqlite-xamarin/sqlite-xamarin.csproj b/src/sqlite-xamarin/sqlite-xamarin.csproj deleted file mode 100644 index 1550813b558..00000000000 --- a/src/sqlite-xamarin/sqlite-xamarin.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - Exe - netstandard2.0 - False - - - - - - $(MicrosoftAndroidSdkOutDir)lib - - - - - - - PreserveNewest - - - \ No newline at end of file diff --git a/src/sqlite-xamarin/sqlite-xamarin.targets b/src/sqlite-xamarin/sqlite-xamarin.targets deleted file mode 100644 index b7998a9eebe..00000000000 --- a/src/sqlite-xamarin/sqlite-xamarin.targets +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - <_SqliteBaseLibName>sqlite3_xamarin - <_SqliteLibName>lib$(_SqliteBaseLibName).so - <_BclFrameworkDir>$(XAInstallPrefix)xbuild-frameworks\MonoAndroid\v1.0\ - - - - - - - - <_ConfigureSqliteCommands - Include="@(AndroidSupportedTargetJitAbi)"> - $(CmakePath) - $(_CmakeAndroidFlags) -DANDROID_NATIVE_API_LEVEL=%(AndroidSupportedTargetJitAbi.ApiLevel) -DANDROID_PLATFORM=android-%(AndroidSupportedTargetJitAbi.ApiLevel) -DANDROID_ABI=%(AndroidSupportedTargetJitAbi.Identity) -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY="$(OutputPath)%(AndroidSupportedTargetJitAbi.Identity)" -DCMAKE_LIBRARY_OUTPUT_DIRECTORY="$(OutputPath)%(AndroidSupportedTargetJitAbi.Identity)" -DCMAKE_BUILD_TYPE=$(Configuration) -DSQLITE_SOURCE_DIR="$(SqliteSourceFullPath)" -DSQLITE_LIBRARY_NAME="$(_SqliteBaseLibName)" -DSQLITE_OUTPUT_DIR="@(AndroidSupportedTargetJitAbi->'$(OutputPath)\%(Identity)')" $(MSBuildThisFileDirectory) - $(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.Identity)-$(Configuration) - - - - - - - - - - - <_BuildSqliteCommands - Include="@(AndroidSupportedTargetJitAbi)"> - $(NinjaPath) - -v - $(IntermediateOutputPath)%(AndroidSupportedTargetJitAbi.Identity)-$(Configuration) - - - - - - - - - - - -