Integrating latest from github/staging

Integrating up through commit 5e1bdae

Code/Framework/AzFramework/Platform/Android/AzFramework/AzFramework_Traits_Android.h

@@ -16,3 +16,6 @@
 #define AZ_TRAIT_AZFRAMEWORK_USE_C11_LOCALTIME_S 0
 #define AZ_TRAIT_AZFRAMEWORK_USE_ERRNO_T_TYPEDEF 1
 #define AZ_TRAIT_AZFRAMEWORK_USE_POSIX_LOCALTIME_R 0
+#define AZ_TRAIT_AZFRAMEWORK_PYTHON_SHELL 0
+#define AZ_TRAIT_AZFRAMEWORK_USE_PROJECT_MANAGER 0
+#define AZ_TRAIT_AZFRAMEWORK_PROCESSLAUNCH_DEFAULT 0

Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommon.h

@@ -0,0 +1,51 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#pragma once
+
+namespace AzFramework
+{
+    class CommunicatorHandleImpl
+    {
+    public:
+        ~CommunicatorHandleImpl() = default;
+
+        bool IsValid() const { return false; }
+        bool IsBroken() const { return false; }
+        int GetHandle() const { return -1; }
+
+        void Break() {}
+        void Close() {}
+        void SetHandle([[maybe_unused]] int handle) {}
+
+    };
+
+    struct StartupInfo
+    {
+        ~StartupInfo();
+
+        void SetupHandlesForChildProcess();
+        void CloseAllHandles();
+
+        int m_inputHandleForChild = -1;
+        int m_outputHandleForChild = -1;
+        int m_errorHandleForChild = -1;
+    };
+
+    struct ProcessData
+    {
+        StartupInfo m_startupInfo;
+        int m_childProcessId = 0;
+        bool m_childProcessIsDone = false;
+    };
+} // namespace AzFramework
+

Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessCommunicator_Android.cpp

@@ -0,0 +1,50 @@
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+
+#include <AzFramework/Process/ProcessCommunicator.h>
+
+namespace AzFramework
+{
+    AZ::u32 StdInOutCommunication::PeekHandle([[maybe_unused]] StdProcessCommunicatorHandle& handle)
+    {
+        return 0;
+    }
+
+    AZ::u32 StdInOutCommunication::ReadDataFromHandle([[maybe_unused]] StdProcessCommunicatorHandle& handle, [[maybe_unused]] void* readBuffer, [[maybe_unused]] AZ::u32 bufferSize)
+    {
+        return 0;
+    }
+
+    AZ::u32 StdInOutCommunication::WriteDataToHandle([[maybe_unused]] StdProcessCommunicatorHandle& handle, [[maybe_unused]] const void* writeBuffer, [[maybe_unused]] AZ::u32 bytesToWrite)
+    {
+        return 0;
+    }
+
+    bool StdInOutProcessCommunicator::CreatePipesForProcess([[maybe_unused]] ProcessData* processData)
+    {
+        return false;
+    }
+
+    void StdInOutProcessCommunicator::WaitForReadyOutputs([[maybe_unused]] OutputStatus& status) const
+    {
+        status.outputDeviceReady = false;
+        status.errorsDeviceReady = false;
+        status.shouldReadOutput = status.shouldReadErrors = false;
+    }
+
+    bool StdInOutProcessCommunicatorForChildProcess::AttachToExistingPipes()
+    {
+        return false;
+    }
+} // namespace AzFramework
+

Code/Framework/AzFramework/Platform/Android/AzFramework/Process/ProcessWatcher_Android.cpp

@@ -0,0 +1,90 @@
+/*
+ * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+ * its licensors.
+ *
+ * For complete copyright and license terms please see the LICENSE at the root of this
+ * distribution (the "License"). All use of this software is governed by the License,
+ * or, if provided, by the license below or the license accompanying this file. Do not
+ * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *
+ */
+
+#include <AzFramework/Process/ProcessWatcher.h>
+#include <AzFramework/Process/ProcessCommunicator.h>
+
+
+namespace AzFramework
+{
+
+    StartupInfo::~StartupInfo()
+    {
+
+    }
+
+    void StartupInfo::SetupHandlesForChildProcess()
+    {
+
+    }
+
+    void StartupInfo::CloseAllHandles()
+    {
+
+    }
+
+    bool ProcessLauncher::LaunchUnwatchedProcess([[maybe_unused]] const ProcessLaunchInfo& processLaunchInfo)
+    {
+        return false;
+    }
+
+    bool ProcessLauncher::LaunchProcess([[maybe_unused]] const ProcessLaunchInfo& processLaunchInfo, [[maybe_unused]] ProcessData& processData)
+    {
+        return false;
+    }
+
+    StdProcessCommunicator* ProcessWatcher::CreateStdCommunicator()
+    {
+        return new StdInOutProcessCommunicator();
+    }
+
+    StdProcessCommunicatorForChildProcess* ProcessWatcher::CreateStdCommunicatorForChildProcess()
+    {
+        return new StdInOutProcessCommunicatorForChildProcess();
+    }
+
+    ProcessWatcher* ProcessWatcher::LaunchProcess([[maybe_unused]] const ProcessLauncher::ProcessLaunchInfo& processLaunchInfo, [[maybe_unused]] ProcessCommunicationType communicationType)
+    {
+        return nullptr;
+    }
+
+    void ProcessWatcher::InitProcessData([[maybe_unused]] bool stdProcessData)
+    {
+
+    }
+
+    ProcessWatcher::ProcessWatcher()
+        : m_pCommunicator(nullptr)
+    {
+
+    }
+
+    ProcessWatcher::~ProcessWatcher()
+    {
+
+    }
+
+    bool ProcessWatcher::IsProcessRunning([[maybe_unused]] AZ::u32* outExitCode)
+    {
+        return false;
+    }
+
+    bool ProcessWatcher::WaitForProcessToExit([[maybe_unused]] AZ::u32 waitTimeInSeconds, [[maybe_unused]] AZ::u32* outExitCode /*= nullptr*/)
+    {
+        return true;
+    }
+
+    void ProcessWatcher::TerminateProcess([[maybe_unused]] AZ::u32 exitCode)
+    {
+
+    }
+} //namespace AzFramework

Code/Framework/AzFramework/Platform/Android/AzFramework/ProjectManager/ProjectManager_Android.cpp

@@ -1,27 +0,0 @@
-/*
- * All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
- * its licensors.
- *
- * For complete copyright and license terms please see the LICENSE at the root of this
- * distribution (the "License"). All use of this software is governed by the License,
- * or, if provided, by the license below or the license accompanying this file. Do not
- * remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *
- */
-
-#include <AzFramework/ProjectManager/ProjectManager.h>
-#include <AzCore/PlatformIncl.h>
-
-
-namespace AzFramework
-{
-    namespace ProjectManager
-    {
-        bool LaunchProjectManager() 
-        {
-            return false;
-        }
-    } // ProjectManager
-} // AzFramework
-

Code/Framework/AzFramework/Platform/Android/platform_android_files.cmake

@@ -15,7 +15,6 @@ set(FILES
     AzFramework/API/ApplicationAPI_Platform.h
     AzFramework/API/ApplicationAPI_Android.h
     AzFramework/Application/Application_Android.cpp
-    AzFramework/ProjectManager/ProjectManager_Android.cpp
     ../Common/Unimplemented/AzFramework/Asset/AssetSystemComponentHelper_Unimplemented.cpp
     AzFramework/IO/LocalFileIO_Android.cpp
     ../Common/Default/AzFramework/Network/AssetProcessorConnection_Default.cpp
@@ -34,4 +33,7 @@ set(FILES
     AzFramework/Input/Devices/VirtualKeyboard/InputDeviceVirtualKeyboard_Android.cpp
     AzFramework/Archive/ArchiveVars_Platform.h
     AzFramework/Archive/ArchiveVars_Android.h
+    AzFramework/Process/ProcessCommon.h
+    AzFramework/Process/ProcessWatcher_Android.cpp
+    AzFramework/Process/ProcessCommunicator_Android.cpp
 )