[LYN-6779] AWSNativeSDK update and AWSCore platform cmake update (#4231)
Signed-off-by: onecent1101 <liug@amazon.com>monroegm-disable-blank-issue-2
parent
0657f6f7ec
commit
ba107c06b6
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 1
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AWSCore_Traits_Android.h>
|
||||||
@ -1,33 +1,33 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors to the Open 3D Engine Project.
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <AzCore/PlatformDef.h>
|
#include <AzCore/PlatformDef.h>
|
||||||
// The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
|
// The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
|
||||||
// AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in
|
// AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in
|
||||||
// C++17. Use std::allocator_traits instead of accessing these members directly. You can define
|
// C++17. Use std::allocator_traits instead of accessing these members directly. You can define
|
||||||
// _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received
|
// _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received
|
||||||
// this warning.
|
// this warning.
|
||||||
AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
|
AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
|
||||||
#include <aws/core/utils/memory/stl/AWSString.h>
|
#include <aws/core/utils/memory/stl/AWSString.h>
|
||||||
AZ_POP_DISABLE_WARNING
|
AZ_POP_DISABLE_WARNING
|
||||||
#include <AzCore/Android/Utils.h>
|
#include <AzCore/Android/Utils.h>
|
||||||
#include <AzCore/std/string/string.h>
|
#include <AzCore/std/string/string.h>
|
||||||
|
|
||||||
namespace AWSCore
|
namespace AWSCore
|
||||||
{
|
{
|
||||||
namespace Platform
|
namespace Platform
|
||||||
{
|
{
|
||||||
Aws::String GetCaCertBundlePath()
|
Aws::String GetCaCertBundlePath()
|
||||||
{
|
{
|
||||||
AZStd::string publicStoragePath = AZ::Android::Utils::GetAppPublicStoragePath();
|
AZStd::string publicStoragePath = AZ::Android::Utils::GetAppPublicStoragePath();
|
||||||
publicStoragePath.append("/certificates/aws/cacert.pem");
|
publicStoragePath.append("/certificates/aws/cacert.pem");
|
||||||
|
|
||||||
return publicStoragePath.c_str();
|
return publicStoragePath.c_str();
|
||||||
}
|
}
|
||||||
} // namespace Platform
|
} // namespace Platform
|
||||||
}
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
set(FILES
|
||||||
|
AWSCore_Traits_Platform.h
|
||||||
|
AWSCore_Traits_Android.h
|
||||||
|
GetCertsPath_Android.cpp
|
||||||
|
)
|
||||||
@ -1,28 +1,28 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors to the Open 3D Engine Project.
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <AzCore/PlatformDef.h>
|
#include <AzCore/PlatformDef.h>
|
||||||
// The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
|
// The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly.
|
||||||
// AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in
|
// AWSAllocator.h(70): warning C4996: 'std::allocator<T>::pointer': warning STL4010: Various members of std::allocator are deprecated in
|
||||||
// C++17. Use std::allocator_traits instead of accessing these members directly. You can define
|
// C++17. Use std::allocator_traits instead of accessing these members directly. You can define
|
||||||
// _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received
|
// _SILENCE_CXX17_OLD_ALLOCATOR_MEMBERS_DEPRECATION_WARNING or _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS to acknowledge that you have received
|
||||||
// this warning.
|
// this warning.
|
||||||
AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
|
AZ_PUSH_DISABLE_WARNING(4251 4996, "-Wunknown-warning-option")
|
||||||
#include <aws/core/utils/memory/stl/AWSString.h>
|
#include <aws/core/utils/memory/stl/AWSString.h>
|
||||||
AZ_POP_DISABLE_WARNING
|
AZ_POP_DISABLE_WARNING
|
||||||
|
|
||||||
namespace AWSCore
|
namespace AWSCore
|
||||||
{
|
{
|
||||||
namespace Platform
|
namespace Platform
|
||||||
{
|
{
|
||||||
Aws::String GetCaCertBundlePath()
|
Aws::String GetCaCertBundlePath()
|
||||||
{
|
{
|
||||||
return ""; // no-op
|
return ""; // no-op
|
||||||
}
|
}
|
||||||
} // namespace Platform
|
} // namespace Platform
|
||||||
} // namespace GridMate
|
} // namespace GridMate
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AWSCore_Traits_Linux.h>
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AWSCore_Traits_Mac.h>
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AWSCore_Traits_Windows.h>
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
set(FILES
|
||||||
|
../../Tests/Editor/AWSCoreEditorSystemComponentTest.cpp
|
||||||
|
../../Tests/Editor/Attribution/AWSCoreAttributionManagerTest.cpp
|
||||||
|
../../Tests/Editor/Attribution/AWSCoreAttributionMetricTest.cpp
|
||||||
|
../../Tests/Editor/Attribution/AWSCoreAttributionSystemComponentTest.cpp
|
||||||
|
../../Tests/Editor/Attribution/AWSAttributionServiceApiTest.cpp
|
||||||
|
../../Tests/Editor/UI/AWSCoreEditorMenuTest.cpp
|
||||||
|
../../Tests/Editor/UI/AWSCoreEditorUIFixture.h
|
||||||
|
../../Tests/Editor/UI/AWSCoreResourceMappingToolActionTest.cpp
|
||||||
|
../../Tests/Editor/AWSCoreEditorManagerTest.cpp
|
||||||
|
)
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
set(FILES
|
||||||
|
AWSCore_Traits_Platform.h
|
||||||
|
AWSCore_Traits_Windows.h
|
||||||
|
../Common/GetCertsPath_Null.cpp
|
||||||
|
)
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AWSCore_Traits_iOS.h>
|
||||||
@ -0,0 +1,10 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Contributors to the Open 3D Engine Project.
|
||||||
|
* For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: Apache-2.0 OR MIT
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#define AWSCORE_BACKWARD_INCOMPATIBLE_CHANGE 0
|
||||||
@ -1,19 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright (c) Contributors to the Open 3D Engine Project.
|
|
||||||
# For complete copyright and license terms please see the LICENSE at the root of this distribution.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: Apache-2.0 OR MIT
|
|
||||||
#
|
|
||||||
#
|
|
||||||
|
|
||||||
set(FILES
|
|
||||||
../../AWSCoreEditorSystemComponentTest.cpp
|
|
||||||
../../Attribution/AWSCoreAttributionManagerTest.cpp
|
|
||||||
../../Attribution/AWSCoreAttributionMetricTest.cpp
|
|
||||||
../../Attribution/AWSCoreAttributionSystemComponentTest.cpp
|
|
||||||
../../Attribution/AWSAttributionServiceApiTest.cpp
|
|
||||||
../../UI/AWSCoreEditorMenuTest.cpp
|
|
||||||
../../UI/AWSCoreEditorUIFixture.h
|
|
||||||
../../UI/AWSCoreResourceMappingToolActionTest.cpp
|
|
||||||
../../AWSCoreEditorManagerTest.cpp
|
|
||||||
)
|
|
||||||
Loading…
Reference in New Issue