Move android files to separate subfolder

renderdoc/CMakeLists.txt

@@ -89,8 +89,8 @@ set(sources
     core/remote_server.cpp
     core/replay_proxy.cpp
     core/replay_proxy.h
-    core/android.cpp
-    core/android.h
+    android/android.cpp
+    android/android.h
     core/plugins.cpp
     core/plugins.h
     core/resource_manager.cpp

renderdoc/core/remote_server.cpp

@@ -25,8 +25,8 @@
 
 #include <sstream>
 #include <utility>
+#include "android/android.h"
 #include "api/replay/renderdoc_replay.h"
-#include "core/android.h"
 #include "core/core.h"
 #include "os/os_specific.h"
 #include "replay/replay_controller.h"

renderdoc/core/target_control.cpp

@@ -23,8 +23,8 @@
  * THE SOFTWARE.
  ******************************************************************************/
 
+#include "android/android.h"
 #include "api/replay/renderdoc_replay.h"
-#include "core/android.h"
 #include "core/core.h"
 #include "jpeg-compressor/jpgd.h"
 #include "os/os_specific.h"

renderdoc/renderdoc.vcxproj

@@ -132,6 +132,7 @@
     <ClInclude Include="3rdparty\zstd\zstdmt_compress.h" />
     <ClInclude Include="3rdparty\zstd\zstd_opt.h" />
     <ClInclude Include="3rdparty\zstd\zstd.h" />
+    <ClInclude Include="android\android.h" />
     <ClInclude Include="api\app\renderdoc_app.h" />
     <ClInclude Include="api\replay\basic_types.h" />
     <ClInclude Include="api\replay\capture_options.h" />
@@ -156,7 +157,6 @@
     <ClInclude Include="common\threading.h" />
     <ClInclude Include="common\timing.h" />
     <ClInclude Include="common\wrapped_pool.h" />
-    <ClInclude Include="core\android.h" />
     <ClInclude Include="core\core.h" />
     <ClInclude Include="core\crash_handler.h" />
     <ClInclude Include="core\plugins.h" />
@@ -305,9 +305,9 @@
       <ForcedIncludeFiles>
       </ForcedIncludeFiles>
     </ClCompile>
+    <ClCompile Include="android\android.cpp" />
     <ClCompile Include="common\common.cpp" />
     <ClCompile Include="common\dds_readwrite.cpp" />
-    <ClCompile Include="core\android.cpp" />
     <ClCompile Include="core\core.cpp" />
     <ClCompile Include="core\image_viewer.cpp" />
     <ClCompile Include="core\plugins.cpp" />

renderdoc/renderdoc.vcxproj.filters

@@ -109,6 +109,9 @@
     <Filter Include="Common\Serialise\Codecs">
       <UniqueIdentifier>{dc39ebda-045d-4d75-8ef9-0c927be3c7ff}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Android">
+      <UniqueIdentifier>{f9ed2873-6120-4b34-a3c2-e57b2de31eb9}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="maths\camera.h">
@@ -291,9 +294,6 @@
     <ClInclude Include="core\precompiled.h">
       <Filter>PCH</Filter>
     </ClInclude>
-    <ClInclude Include="core\android.h">
-      <Filter>Core</Filter>
-    </ClInclude>
     <ClInclude Include="core\plugins.h">
       <Filter>Core</Filter>
     </ClInclude>
@@ -375,6 +375,9 @@
     <ClInclude Include="os\posix\posix_network.h">
       <Filter>OS\Posix</Filter>
     </ClInclude>
+    <ClInclude Include="android\android.h">
+      <Filter>Android</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="maths\camera.cpp">
@@ -557,9 +560,6 @@
     <ClCompile Include="3rdparty\catch\catch.cpp">
       <Filter>3rdparty\catch</Filter>
     </ClCompile>
-    <ClCompile Include="core\android.cpp">
-      <Filter>Replay</Filter>
-    </ClCompile>
     <ClCompile Include="replay\basic_types_tests.cpp">
       <Filter>Replay</Filter>
     </ClCompile>
@@ -650,6 +650,9 @@
     <ClCompile Include="os\posix\android\android_network.cpp">
       <Filter>OS\Posix\Android</Filter>
     </ClCompile>
+    <ClCompile Include="android\android.cpp">
+      <Filter>Android</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="os\win32\comexport.def">

renderdoc/replay/entry_points.cpp

@@ -24,10 +24,10 @@
  ******************************************************************************/
 
 #include "3rdparty/catch/catch.hpp"
+#include "android/android.h"
 #include "api/replay/renderdoc_replay.h"
 #include "api/replay/version.h"
 #include "common/common.h"
-#include "core/android.h"
 #include "core/core.h"
 #include "maths/camera.h"
 #include "maths/formatpacking.h"
@@ -688,4 +688,4 @@ extern "C" RENDERDOC_API void RENDERDOC_CC RENDERDOC_ResourceFormatName(const Re
                                                                         rdcstr &name)
 {
   name = ResourceFormatName(fmt);
-}
+}