Renamed osx_gl to mac and es3 to android for cache folders (#949)

AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings

@@ -1 +1 @@
-/autooptimizefile=0 /preset=AlbedoWithGenericAlpha /reduce="es3:2,ios:2,osx_gl:0,pc:0,provo:0"
+/autooptimizefile=0 /preset=AlbedoWithGenericAlpha /reduce="android:2,ios:2,mac:0,pc:0,provo:0"

AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings

@@ -1 +1 @@
-/autooptimizefile=0 /preset=Albedo /reduce="es3:3,ios:3,osx_gl:0,pc:0,provo:0"
+/autooptimizefile=0 /preset=Albedo /reduce="android:3,ios:3,mac:0,pc:0,provo:0"

AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/ap_all_platforms_setup_fixture.py

@@ -34,10 +34,10 @@ def ap_all_platforms_setup_fixture(request, workspace, ap_setup_fixture) -> Dict
 
     # Specific platform cache locations
     resources["pc_cache_location"] = os.path.join(cache_dir, "pc")
-    resources["es3_cache_location"] = os.path.join(cache_dir, "es3")
+    resources["android_cache_location"] = os.path.join(cache_dir, "android")
     resources["ios_cache_location"] = os.path.join(cache_dir, "ios")
-    resources["osx_gl_cache_location"] = os.path.join(cache_dir, "osx_gl")
+    resources["mac_cache_location"] = os.path.join(cache_dir, "mac")
     resources["provo_cache_location"] = os.path.join(cache_dir, "provo")
-    resources["all_platforms"] = ["pc", "es3", "ios", "osx_gl", "provo"]
+    resources["all_platforms"] = ["pc", "android", "ios", "mac", "provo"]
 
     return resources

AutomatedTesting/Gem/PythonTests/assetpipeline/ap_fixtures/bundler_batch_setup_fixture.py

@@ -54,7 +54,7 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
         platforms = [platform.strip() for platform in platforms.split(",")]
     else:
         # No commandline argument provided, default to mac and pc
-        platforms = ["pc", "osx_gl"]
+        platforms = ["pc", "mac"]
 
     class BundlerBatchFixture:
         """
@@ -241,11 +241,11 @@ def bundler_batch_setup_fixture(request, workspace, asset_processor, timeout) ->
         def get_platform_flag(self, platform_name: str) -> int:
             if (platform_name == "pc"):
                 return 1
-            elif (platform_name == "es3"):
+            elif (platform_name == "android"):
                 return 2
             elif (platform_name == "ios"):
                 return 4
-            elif (platform_name == "osx_gl"):
+            elif (platform_name == "mac"):
                 return 8
             elif (platform_name == "server"):
                 return 128

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_bundler_batch_tests.py

@@ -460,9 +460,9 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         """
         helper = bundler_batch_helper
         # fmt:off
-        assert "pc" in helper["platforms"] and "osx_gl" in helper["platforms"], \
+        assert "pc" in helper["platforms"] and "mac" in helper["platforms"], \
             "This test requires both PC and MAC platforms to be enabled. " \
-            "Please rerun with commandline option: '--bundle_platforms=pc,osx_gl'"
+            "Please rerun with commandline option: '--bundle_platforms=pc,mac'"
         # fmt:on
 
         seed_list = os.path.join(workspace.paths.engine_root(), "Engine", "SeedAssetList.seed")  # Engine seed list
@@ -502,7 +502,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         for bundle_file in bundle_files.values():
             assert os.path.isfile(bundle_file)
 
-        # This asset is created on osx_gl platform but not on windows
+        # This asset is created on mac platform but not on windows
         file_to_check = b"engineassets/shading/defaultprobe_cm.dds.5"  # [use byte str because file is in binary]
 
         # Extract the delta catalog file from pc archive. {file_to_check} SHOULD NOT be present for PC
@@ -512,11 +512,11 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             f"{file_to_check} was found in DeltaCatalog.xml in pc bundle file {bundle_files['pc']}"
         # fmt:on
 
-        # Extract the delta catalog file from osx_gl archive. {file_to_check} SHOULD be present for MAC
-        file_contents = helper.extract_file_content(bundle_files["osx_gl"], "DeltaCatalog.xml")
+        # Extract the delta catalog file from mac archive. {file_to_check} SHOULD be present for MAC
+        file_contents = helper.extract_file_content(bundle_files["mac"], "DeltaCatalog.xml")
         # fmt:off
         assert file_to_check in file_contents, \
-            f"{file_to_check} was not found in DeltaCatalog.xml in darwin bundle file {bundle_files['osx_gl']}"
+            f"{file_to_check} was not found in DeltaCatalog.xml in darwin bundle file {bundle_files['mac']}"
         # fmt:on
 
         # Gather checksums for first set of bundles
@@ -613,7 +613,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             addSeed=test_asset,
-            platform="pc,osx_gl",
+            platform="pc,mac",
         )
 
         # Validate both mac and pc are activated for seed
@@ -626,7 +626,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             removePlatformFromSeeds="",
-            platform="osx_gl",
+            platform="mac",
         )
         # Validate only pc platform for seed. Save file contents to variable
         all_lines = check_seed_platform(helper["seed_list_file"], test_asset, helper["platform_values"]["pc"])
@@ -646,7 +646,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             addPlatformToSeeds="",
-            platform="osx_gl",
+            platform="mac",
         )
         # Validate Mac platform was added back on. Save file contents
         # fmt:off
@@ -670,7 +670,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         helper.call_seeds(
             seedListFile=helper["seed_list_file"],
             removeSeed=test_asset,
-            platform="pc,osx_gl",
+            platform="pc,mac",
         )
 
         # Validate seed was removed from file
@@ -697,9 +697,9 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         env = ap_setup_fixture
 
         # fmt:off
-        assert "pc" in helper["platforms"] and "osx_gl" in helper["platforms"], \
+        assert "pc" in helper["platforms"] and "mac" in helper["platforms"], \
             "This test requires both PC and MAC platforms to be enabled. " \
-            "Please rerun with commandline option: '--bundle_platforms=pc,osx_gl'"
+            "Please rerun with commandline option: '--bundle_platforms=pc,mac'"
         # fmt:on
 
         # Test assets arranged in common lists: six (0-5) .txt files and .dat files
@@ -717,16 +717,16 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
         file_platforms = {
             "txtfile_0.txt": "pc",
             "txtfile_1.txt": "pc",
-            "txtfile_2.txt": "pc,osx_gl",
-            "txtfile_3.txt": "pc,osx_gl",
-            "txtfile_4.txt": "osx_gl",
-            "txtfile_5.txt": "osx_gl",
+            "txtfile_2.txt": "pc,mac",
+            "txtfile_3.txt": "pc,mac",
+            "txtfile_4.txt": "mac",
+            "txtfile_5.txt": "mac",
             "datfile_0.dat": "pc",
             "datfile_1.dat": "pc",
-            "datfile_2.dat": "pc,osx_gl",
-            "datfile_3.dat": "pc,osx_gl",
-            "datfile_4.dat": "osx_gl",
-            "datfile_5.dat": "osx_gl",
+            "datfile_2.dat": "pc,mac",
+            "datfile_3.dat": "pc,mac",
+            "datfile_4.dat": "mac",
+            "datfile_5.dat": "mac",
         }
 
         # Comparison rules files and their associated 'comparisonType' flags
@@ -741,7 +741,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
 
         # Get our test assets ready and processed
         utils.prepare_test_assets(env["tests_dir"], "C16877178", env["project_test_assets_dir"])
-        asset_processor.batch_process(timeout=timeout, fastscan=False, platforms="pc,osx_gl")
+        asset_processor.batch_process(timeout=timeout, fastscan=False, platforms="pc,mac")
 
         # *** Some helper functions *** #
 
@@ -759,7 +759,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             helper.call_assetLists(
                 assetListFile=os.path.join(helper["test_dir"], asset_list_file_name),
                 seedListFile=os.path.join(helper["test_dir"], seed_file_name),
-                platform="pc,osx_gl",
+                platform="pc,mac",
             )
 
         def get_platform_assets(asset_name_list: List[str]) -> Dict[str, List[str]]:
@@ -769,7 +769,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
             for asset_name in asset_name_list:
                 if "pc" in file_platforms[asset_name]:
                     win_assets.append(asset_name)
-                if "osx_gl" in file_platforms[asset_name]:
+                if "mac" in file_platforms[asset_name]:
                     mac_assets.append(asset_name)
             return {"win": win_assets, "mac": mac_assets}
 
@@ -798,7 +798,7 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
 
             # Get platform result file names
             win_asset_list_file = helper.platform_file_name(request_file, platforms["pc"])
-            mac_asset_list_file = helper.platform_file_name(request_file, platforms["osx_gl"])
+            mac_asset_list_file = helper.platform_file_name(request_file, platforms["mac"])
 
             # Get expected platforms for each asset in asset_names
             platform_files = get_platform_assets(asset_names)
@@ -879,14 +879,14 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                 # fmt:on
             # End verify_asset_list_contents()
 
-            def run_compare_command_and_verify(platform_arg: str, expect_pc_output: bool, expect_osx_gl_output: bool) -> None:
+            def run_compare_command_and_verify(platform_arg: str, expect_pc_output: bool, expect_mac_output: bool) -> None:
                 # Expected asset list to equal result of comparison
                 expected_pc_asset_list = None
-                expected_osx_gl_asset_list = None
+                expected_mac_asset_list = None
 
                 # Last output file. Use this for comparison to 'expected'
                 output_pc_asset_list = None
-                output_osx_gl_asset_list = None
+                output_mac_asset_list = None
 
                 # Add the platform to the file name to match what the Bundler will create
                 last_output_arg = output_arg.split(",")[-1]
@@ -895,10 +895,10 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                     expected_pc_asset_list = os.path.join(helper["test_dir"], helper.platform_file_name(expected_asset_list, platform))
                     output_pc_asset_list = helper.platform_file_name(last_output_arg, platform)
 
-                if expect_osx_gl_output:
-                    platform = platforms["osx_gl"]
-                    expected_osx_gl_asset_list = os.path.join(helper["test_dir"], helper.platform_file_name(expected_asset_list, platform))
-                    output_osx_gl_asset_list = helper.platform_file_name(last_output_arg, platform)
+                if expect_mac_output:
+                    platform = platforms["mac"]
+                    expected_mac_asset_list = os.path.join(helper["test_dir"], helper.platform_file_name(expected_asset_list, platform))
+                    output_mac_asset_list = helper.platform_file_name(last_output_arg, platform)
 
                 # Build execution command
                 cmd = generate_compare_command(platform_arg)
@@ -911,15 +911,15 @@ class TestsAssetBundlerBatch_WindowsAndMac(object):
                     verify_asset_list_contents(expected_pc_asset_list, output_pc_asset_list)
                     fs.delete([output_pc_asset_list], True, True)
 
-                if expect_osx_gl_output:
-                    verify_asset_list_contents(expected_osx_gl_asset_list, output_osx_gl_asset_list)
-                    fs.delete([output_osx_gl_asset_list], True, True)
+                if expect_mac_output:
+                    verify_asset_list_contents(expected_mac_asset_list, output_mac_asset_list)
+                    fs.delete([output_mac_asset_list], True, True)
             # End run_compare_command_and_verify()
 
             # Generate command, run and validate for each platform
             run_compare_command_and_verify("pc", True, False)
-            run_compare_command_and_verify("osx_gl", False, True)
-            run_compare_command_and_verify("pc,osx_gl", True, True)
+            run_compare_command_and_verify("mac", False, True)
+            run_compare_command_and_verify("pc,mac", True, True)
             #run_compare_command_and_verify(None, True, True)
 
         # End compare_and_check()

AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests.py

@@ -102,7 +102,7 @@ class TestsAssetProcessorBatch_AllPlatforms(object):
     def test_RunAPBatch_TwoPlatforms_ExitCodeZero(self, asset_processor):
         asset_processor.create_temp_asset_root()
         asset_processor.enable_asset_processor_platform("pc")
-        asset_processor.enable_asset_processor_platform("osx_gl")
+        asset_processor.enable_asset_processor_platform("mac")
         result, _ = asset_processor.batch_process()
         assert result, "AP Batch failed"
 

AutomatedTesting/Objects/LumberTank/ProxyGray_ddna.tif.exportsettings

@@ -1 +1 @@
-/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="es3:1,ios:1,osx_gl:0,pc:0,provo:0"
+/autooptimizefile=0 /M=50,50,0,50,50,50 /preset=NormalsWithSmoothness /reduce="android:1,ios:1,mac:0,pc:0,provo:0"

Code/CryEngine/CryCommon/ISystem.h

@@ -125,7 +125,7 @@ enum ESystemConfigPlatform
 {
     CONFIG_INVALID_PLATFORM = 0,
     CONFIG_PC = 1,
-    CONFIG_OSX_GL = 2,
+    CONFIG_MAC = 2,
     CONFIG_OSX_METAL = 3,
     CONFIG_ANDROID = 4,
     CONFIG_IOS = 5,

Code/CryEngine/CrySystem/System.h

@@ -729,7 +729,7 @@ protected: // -------------------------------------------------------------
     CCmdLine*                                      m_pCmdLine;
 
     string  m_currentLanguageAudio;
-    string  m_systemConfigName; // computed from system_(hardwareplatform)_(assetsPlatform) - eg, system_android_es3.cfg or system_android_opengl.cfg or system_windows_pc.cfg
+    string  m_systemConfigName; // computed from system_(hardwareplatform)_(assetsPlatform) - eg, system_android_android.cfg or system_windows_pc.cfg
 
     std::vector< std::pair<CTimeValue, float> > m_updateTimes;
 

Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.cpp

@@ -19,7 +19,7 @@ namespace AZ
 {
     inline namespace PlatformDefaults
     {
-        static const char* PlatformNames[PlatformId::NumPlatformIds] = { PlatformPC, PlatformES3, PlatformIOS, PlatformOSX, PlatformProvo, PlatformSalem, PlatformJasper, PlatformServer, PlatformAll, PlatformAllClient };
+        static const char* PlatformNames[PlatformId::NumPlatformIds] = { PlatformPC, PlatformAndroid, PlatformIOS, PlatformMac, PlatformProvo, PlatformSalem, PlatformJasper, PlatformServer, PlatformAll, PlatformAllClient };
 
         const char* PlatformIdToPalFolder(AZ::PlatformId platform)
         {
@@ -31,11 +31,11 @@ namespace AZ
             {
             case AZ::PC:
                 return "PC";
-            case AZ::ES3:
+            case AZ::ANDROID_ID:
                 return "Android";
             case AZ::IOS:
                 return "iOS";
-            case AZ::OSX:
+            case AZ::MAC:
                 return "Mac";
             case AZ::PROVO:
                 return "Provo";
@@ -66,11 +66,11 @@ namespace AZ
             }
             else if (osPlatform == PlatformCodeNameMac)
             {
-                return PlatformOSX;
+                return PlatformMac;
             }
             else if (osPlatform == PlatformCodeNameAndroid)
             {
-                return PlatformES3;
+                return PlatformAndroid;
             }
             else if (osPlatform == PlatformCodeNameiOS)
             {
@@ -207,13 +207,13 @@ namespace AZ
                 platformCodes.emplace_back(PlatformCodeNameWindows);
                 platformCodes.emplace_back(PlatformCodeNameLinux);
                 break;
-            case PlatformId::ES3:
+            case PlatformId::ANDROID_ID:
                 platformCodes.emplace_back(PlatformCodeNameAndroid);
                 break;
             case PlatformId::IOS:
                 platformCodes.emplace_back(PlatformCodeNameiOS);
                 break;
-            case PlatformId::OSX:
+            case PlatformId::MAC:
                 platformCodes.emplace_back(PlatformCodeNameMac);
                 break;
             case PlatformId::PROVO:

Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.h

@@ -27,9 +27,9 @@ namespace AZ
     inline namespace PlatformDefaults
     {
         constexpr char PlatformPC[] = "pc";
-        constexpr char PlatformES3[] = "es3";
+        constexpr char PlatformAndroid[] = "android";
         constexpr char PlatformIOS[] = "ios";
-        constexpr char PlatformOSX[] = "osx_gl";
+        constexpr char PlatformMac[] = "mac";
         constexpr char PlatformProvo[] = "provo";
         constexpr char PlatformSalem[] = "salem";
         constexpr char PlatformJasper[] = "jasper";
@@ -54,9 +54,9 @@ namespace AZ
         AZ_ENUM_WITH_UNDERLYING_TYPE(PlatformId, int,
             (Invalid, -1),
             PC,
-            ES3,
+            ANDROID_ID,
             IOS,
-            OSX,
+            MAC,
             PROVO,
             SALEM,
             JASPER,
@@ -73,9 +73,9 @@ namespace AZ
         {
             Platform_NONE = 0x00,
             Platform_PC = 1 << PlatformId::PC,
-            Platform_ES3 = 1 << PlatformId::ES3,
+            Platform_ANDROID = 1 << PlatformId::ANDROID_ID,
             Platform_IOS = 1 << PlatformId::IOS,
-            Platform_OSX = 1 << PlatformId::OSX,
+            Platform_MAC = 1 << PlatformId::MAC,
             Platform_PROVO = 1 << PlatformId::PROVO,
             Platform_SALEM = 1 << PlatformId::SALEM,
             Platform_JASPER = 1 << PlatformId::JASPER,
@@ -87,7 +87,7 @@ namespace AZ
             // A special platform that will always correspond to all non-server platforms, even if new ones are added
             Platform_ALL_CLIENT = 1ULL << 31,
 
-            AllNamedPlatforms = Platform_PC | Platform_ES3 | Platform_IOS | Platform_OSX | Platform_PROVO | Platform_SALEM | Platform_JASPER | Platform_SERVER,
+            AllNamedPlatforms = Platform_PC | Platform_ANDROID | Platform_IOS | Platform_MAC | Platform_PROVO | Platform_SALEM | Platform_JASPER | Platform_SERVER,
         };
 
         AZ_DEFINE_ENUM_BITWISE_OPERATORS(PlatformFlags);

Code/Framework/AzCore/AzCore/PlatformId/PlatformId.cpp

@@ -28,8 +28,8 @@ namespace AZ
             return "Android64";
         case PlatformID::PLATFORM_APPLE_IOS:
             return "iOS";
-        case PlatformID::PLATFORM_APPLE_OSX:
-            return "OSX";
+        case PlatformID::PLATFORM_APPLE_MAC:
+            return "Mac";
 #if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
 #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
         case PlatformID::PLATFORM_##PUBLICNAME:\

Code/Framework/AzCore/AzCore/PlatformId/PlatformId.h

@@ -23,7 +23,7 @@ namespace AZ
         PLATFORM_WINDOWS_64,
         PLATFORM_LINUX_64,
         PLATFORM_APPLE_IOS,
-        PLATFORM_APPLE_OSX,
+        PLATFORM_APPLE_MAC,
         PLATFORM_ANDROID_64,    // ARMv8 / 64-bit
         #if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
 #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\

Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp

@@ -937,7 +937,7 @@ void ScriptSystemComponent::Reflect(ReflectContext* reflection)
             ->Enum<static_cast<int>(PlatformID::PLATFORM_LINUX_64)>("Linux")
             ->Enum<static_cast<int>(PlatformID::PLATFORM_ANDROID_64)>("Android64")
             ->Enum<static_cast<int>(PlatformID::PLATFORM_APPLE_IOS)>("iOS")
-            ->Enum<static_cast<int>(PlatformID::PLATFORM_APPLE_OSX)>("OSX")
+            ->Enum<static_cast<int>(PlatformID::PLATFORM_APPLE_MAC)>("Mac")
 #if defined(AZ_EXPAND_FOR_RESTRICTED_PLATFORM) || defined(AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS)
 #define AZ_RESTRICTED_PLATFORM_EXPANSION(CodeName, CODENAME, codename, PrivateName, PRIVATENAME, privatename, PublicName, PUBLICNAME, publicname, PublicAuxName1, PublicAuxName2, PublicAuxName3)\
             ->Enum<static_cast<int>(PlatformID::PLATFORM_##PUBLICNAME)>(#CodeName)

Code/Framework/AzCore/Tests/SettingsRegistryMergeUtilsTests.cpp

@@ -372,15 +372,15 @@ mac_remote_filesystem=0
 -- We need to know this before we establish VFS because different platform assets
 -- are stored in different root folders in the cache.  These correspond to the names
 -- In the asset processor config file.  This value also controls what config file is read
--- when you read system_xxxx_xxxx.cfg (for example, system_windows_pc.cfg or system_android_es3.cfg)
+-- when you read system_xxxx_xxxx.cfg (for example, system_windows_pc.cfg or system_android_android.cfg)
 -- by default, pc assets (in the 'pc' folder) are used, with RC being fed 'pc' as the platform
 -- by default on console we use the default assets=pc for better iteration times
 -- we should turn on console specific assets only when in release and/or testing assets and/or loading performance
 -- that way most people will not need to have 3 different caches taking up disk space
 assets = pc
-android_assets = es3
+android_assets = android
 ios_assets = ios
-mac_assets = osx_gl
+mac_assets = mac
 
 -- Add the IP address of your console to the white list that will connect to the asset processor here
 -- You can list addresses or CIDR's. CIDR's are helpful if you are using DHCP. A CIDR looks like an ip address with
@@ -438,9 +438,9 @@ mac_wait_for_connect=0
             ConfigFileParams::SettingsKeyValuePair{"/ios_remote_filesystem", AZ::s64{0}},
             ConfigFileParams::SettingsKeyValuePair{"/mac_remote_filesystem", AZ::s64{0}},
             ConfigFileParams::SettingsKeyValuePair{"/assets", AZStd::string_view{"pc"}},
-            ConfigFileParams::SettingsKeyValuePair{"/android_assets", AZStd::string_view{"es3"}},
+            ConfigFileParams::SettingsKeyValuePair{"/android_assets", AZStd::string_view{"android"}},
             ConfigFileParams::SettingsKeyValuePair{"/ios_assets", AZStd::string_view{"ios"}},
-            ConfigFileParams::SettingsKeyValuePair{"/mac_assets", AZStd::string_view{"osx_gl"}},
+            ConfigFileParams::SettingsKeyValuePair{"/mac_assets", AZStd::string_view{"mac"}},
             ConfigFileParams::SettingsKeyValuePair{"/connect_to_remote", AZ::s64{0}},
             ConfigFileParams::SettingsKeyValuePair{"/windows_connect_to_remote", AZ::s64{1}},
             ConfigFileParams::SettingsKeyValuePair{"/android_connect_to_remote", AZ::s64{0}},
@@ -478,20 +478,20 @@ test_asset_processor_tag = test_value
 [Platform pc]
 tags=tools,renderer,dx12,vulkan
 
-[Platform es3]
+[Platform android]
 tags=android,mobile,renderer,vulkan ; With Comments at the end
 
 [Platform ios]
 tags=mobile,renderer,metal
 
-[Platform osx_gl]
+[Platform mac]
 tags=tools,renderer,metal)"
         , AZStd::fixed_vector<ConfigFileParams::SettingsKeyValuePair, 20>{
             ConfigFileParams::SettingsKeyValuePair{"/test_asset_processor_tag", AZStd::string_view{"test_value"}},
             ConfigFileParams::SettingsKeyValuePair{"/Platform pc/tags", AZStd::string_view{"tools,renderer,dx12,vulkan"}},
-            ConfigFileParams::SettingsKeyValuePair{"/Platform es3/tags", AZStd::string_view{"android,mobile,renderer,vulkan"}},
+            ConfigFileParams::SettingsKeyValuePair{"/Platform android/tags", AZStd::string_view{"android,mobile,renderer,vulkan"}},
             ConfigFileParams::SettingsKeyValuePair{"/Platform ios/tags", AZStd::string_view{"mobile,renderer,metal"}},
-            ConfigFileParams::SettingsKeyValuePair{"/Platform osx_gl/tags", AZStd::string_view{"tools,renderer,metal"}},
+            ConfigFileParams::SettingsKeyValuePair{"/Platform mac/tags", AZStd::string_view{"tools,renderer,metal"}},
         }}
         )
     );

Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h

@@ -120,14 +120,14 @@ namespace AzToolsFramework
 
             /**
             * Query to see if a specific asset platform is enabled
-            * @param platform the asset platform to check e.g. es3, ios, etc.
+            * @param platform the asset platform to check e.g. android, ios, etc.
             * @return true if enabled, false otherwise
             */
             virtual bool IsAssetPlatformEnabled(const char* platform) = 0;
 
             /**
             * Get the total number of pending assets left to process for a specific asset platform
-            * @param platform the asset platform to check e.g. es3, ios, etc.
+            * @param platform the asset platform to check e.g. android, ios, etc.
             * @return -1 if the process fails, a positive number otherwise
             */
             virtual int GetPendingAssetsForPlatform(const char* platform) = 0;
@@ -312,7 +312,7 @@ namespace AzToolsFramework
         inline const char* GetHostAssetPlatform()
         {
 #if defined(AZ_PLATFORM_MAC)
-            return "osx_gl";
+            return "mac";
 #elif defined(AZ_PLATFORM_WINDOWS)
             return "pc";
 #elif defined(AZ_PLATFORM_LINUX)

Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp

@@ -82,7 +82,7 @@ namespace UnitTest
             }
 
             m_testPlatforms[0] = AzFramework::PlatformId::PC;
-            m_testPlatforms[1] = AzFramework::PlatformId::ES3;
+            m_testPlatforms[1] = AzFramework::PlatformId::ANDROID_ID;
 
             int platformCount = 0;
             for(auto thisPlatform : m_testPlatforms)
@@ -170,20 +170,20 @@ namespace UnitTest
             AzFramework::AssetCatalog assetCatalog(useRequestBus);
 
             AZStd::string pcCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::PC);
-            AZStd::string es3CatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ES3);
+            AZStd::string androidCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ANDROID_ID);
 
             if (!assetCatalog.SaveCatalog(pcCatalogFile.c_str(), m_assetRegistry))
             {
                 GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to save the asset catalog (PC) file.\n").c_str());
             }
 
-            if (!assetCatalog.SaveCatalog(es3CatalogFile.c_str(), m_assetRegistry))
+            if (!assetCatalog.SaveCatalog(androidCatalogFile.c_str(), m_assetRegistry))
             {
-                GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to save the asset catalog (ES3) file.\n").c_str());
+                GTEST_FATAL_FAILURE_(AZStd::string::format("Unable to save the asset catalog (ANDROID) file.\n").c_str());
             }
 
             m_pcCatalog = new AzToolsFramework::PlatformAddressedAssetCatalog(AzFramework::PlatformId::PC);
-            m_es3Catalog = new AzToolsFramework::PlatformAddressedAssetCatalog(AzFramework::PlatformId::ES3);
+            m_androidCatalog = new AzToolsFramework::PlatformAddressedAssetCatalog(AzFramework::PlatformId::ANDROID_ID);
 
             const AZStd::string engroot = AZ::Test::GetEngineRootPath();
             AZ::IO::FileIOBase::GetInstance()->SetAlias("@engroot@", engroot.c_str());
@@ -227,21 +227,21 @@ namespace UnitTest
             }
 
             auto pcCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::PC);
-            auto es3CatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ES3);
+            auto androidCatalogFile = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ANDROID_ID);
             if (fileIO->Exists(pcCatalogFile.c_str()))
             {
                 fileIO->Remove(pcCatalogFile.c_str());
             }
 
-            if (fileIO->Exists(es3CatalogFile.c_str()))
+            if (fileIO->Exists(androidCatalogFile.c_str()))
             {
-                fileIO->Remove(es3CatalogFile.c_str());
+                fileIO->Remove(androidCatalogFile.c_str());
             }
 
             delete m_assetSeedManager;
             delete m_assetRegistry;
             delete m_pcCatalog;
-            delete m_es3Catalog;
+            delete m_androidCatalog;
             m_application->Stop();
             delete m_application;
         }
@@ -342,10 +342,10 @@ namespace UnitTest
             m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_PC);
 
             // Step we are testing
-            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ANDROID_ID);
 
             // Verification
-            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3;
+            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID;
             for (const auto& seedInfo : m_assetSeedManager->GetAssetSeedList())
             {
                 EXPECT_EQ(seedInfo.m_platformFlags, expectedPlatformFlags);
@@ -358,14 +358,14 @@ namespace UnitTest
             m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC);
             m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_PC);
 
-            m_es3Catalog->UnregisterAsset(assets[2]);
+            m_androidCatalog->UnregisterAsset(assets[2]);
             m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_PC);
 
             // Step we are testing
-            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ANDROID_ID);
 
             // Verification
-            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3;
+            AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID;
             for (const auto& seedInfo : m_assetSeedManager->GetAssetSeedList())
             {
                 if (seedInfo.m_assetId == assets[2])
@@ -383,14 +383,14 @@ namespace UnitTest
         {
             // Setup
             m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC);
-            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_ANDROID);
             m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_PC);
-            m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[1], AzFramework::PlatformFlags::Platform_ANDROID);
             m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_PC);
-            m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_ANDROID);
 
             // Step we are testing
-            m_assetSeedManager->RemovePlatformFromAllSeeds(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->RemovePlatformFromAllSeeds(AzFramework::PlatformId::ANDROID_ID);
 
             // Verification
             for (const auto& seedInfo : m_assetSeedManager->GetAssetSeedList())
@@ -514,8 +514,8 @@ namespace UnitTest
 
         void DependencyValidation_MultipleAssetSeeds_MultiplePlatformFlags_ListValid()
         {
-            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
-            m_assetSeedManager->AddSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
+            m_assetSeedManager->AddSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
 
             AzToolsFramework::AssetFileInfoList assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -531,7 +531,7 @@ namespace UnitTest
 
             assetList.m_fileInfoList.clear();
 
-            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
 
             assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -547,7 +547,7 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[8]));
 
             assetList.m_fileInfoList.clear();
-            m_assetSeedManager->RemoveSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->RemoveSeedAsset(assets[5], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID);
 
             assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -562,7 +562,7 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[8]));
 
             // Removing the android flag from the asset should still produce the same result 
-            m_assetSeedManager->RemoveSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ES3);
+            m_assetSeedManager->RemoveSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ANDROID);
 
             assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::PC);
 
@@ -576,7 +576,7 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[7]));
             EXPECT_TRUE(Search(assetList, assets[8]));
 
-            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ES3);
+            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ANDROID_ID);
 
             EXPECT_EQ(assetList.m_fileInfoList.size(), 5);
             EXPECT_TRUE(Search(assetList, assets[0]));
@@ -586,8 +586,8 @@ namespace UnitTest
             EXPECT_TRUE(Search(assetList, assets[4]));
 
             // Adding the android flag again to the asset 
-            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ES3);
-            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ES3);
+            m_assetSeedManager->AddSeedAsset(assets[8], AzFramework::PlatformFlags::Platform_ANDROID);
+            assetList = m_assetSeedManager->GetDependencyList(AzFramework::PlatformId::ANDROID_ID);
 
             EXPECT_EQ(assetList.m_fileInfoList.size(), 8);
             EXPECT_TRUE(Search(assetList, assets[0]));
@@ -773,7 +773,7 @@ namespace UnitTest
         AzFramework::AssetRegistry* m_assetRegistry;
         ToolsTestApplication* m_application;
         AzToolsFramework::PlatformAddressedAssetCatalog* m_pcCatalog;
-        AzToolsFramework::PlatformAddressedAssetCatalog* m_es3Catalog;
+        AzToolsFramework::PlatformAddressedAssetCatalog* m_androidCatalog;
         AZ::IO::FileIOStream m_fileStreams[s_totalTestPlatforms][s_totalAssets];
         AzFramework::PlatformId m_testPlatforms[s_totalTestPlatforms];
         AZStd::string m_assetsPath[s_totalAssets];
@@ -936,7 +936,7 @@ namespace UnitTest
     TEST_F(AssetSeedManagerTest, AddSeedAssetForValidPlatforms_AllPlatformsValid_SeedAddedForEveryInputPlatform)
     {
         using namespace AzFramework;
-        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ES3;
+        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ANDROID;
         AZStd::pair<AZ::Data::AssetId, PlatformFlags> result = m_assetSeedManager->AddSeedAssetForValidPlatforms(TestDynamicSliceAssetPath, validPlatforms);
 
         // Verify the function outputs
@@ -953,8 +953,8 @@ namespace UnitTest
     TEST_F(AssetSeedManagerTest, AddSeedAssetForValidPlatforms_SomePlatformsValid_SeedAddedForEveryValidPlatform)
     {
         using namespace AzFramework;
-        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ES3;
-        PlatformFlags inputPlatforms = validPlatforms | PlatformFlags::Platform_OSX;
+        PlatformFlags validPlatforms = PlatformFlags::Platform_PC | PlatformFlags::Platform_ANDROID;
+        PlatformFlags inputPlatforms = validPlatforms | PlatformFlags::Platform_MAC;
         AZStd::pair<AZ::Data::AssetId, PlatformFlags> result = m_assetSeedManager->AddSeedAssetForValidPlatforms(TestDynamicSliceAssetPath, inputPlatforms);
 
         // Verify the function outputs
@@ -971,7 +971,7 @@ namespace UnitTest
     TEST_F(AssetSeedManagerTest, AddSeedAssetForValidPlatforms_NoPlatformsValid_NoSeedAdded)
     {
         using namespace AzFramework;
-        PlatformFlags inputPlatforms = PlatformFlags::Platform_OSX;
+        PlatformFlags inputPlatforms = PlatformFlags::Platform_MAC;
         AZStd::pair<AZ::Data::AssetId, PlatformFlags> result = m_assetSeedManager->AddSeedAssetForValidPlatforms(TestDynamicSliceAssetPath, inputPlatforms);
 
         // Verify the function outputs
@@ -985,30 +985,30 @@ namespace UnitTest
 
     TEST_F(AssetSeedManagerTest, Valid_Seed_Remove_ForAllPlatform_OK)
     {
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& seedList = m_assetSeedManager->GetAssetSeedList();
 
         EXPECT_EQ(seedList.size(), 0);
 
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset("asset0.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset("asset0.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& secondSeedList = m_assetSeedManager->GetAssetSeedList();
         EXPECT_EQ(secondSeedList.size(), 0);
     }
 
     TEST_F(AssetSeedManagerTest, Valid_Seed_Remove_ForSpecificPlatform_OK)
     {
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset(assets[0].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& seedList = m_assetSeedManager->GetAssetSeedList();
 
         EXPECT_EQ(seedList.size(), 1);
 
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
         m_assetSeedManager->RemoveSeedAsset("asset0.txt", AzFramework::PlatformFlags::Platform_PC);
         const AzFramework::AssetSeedList& secondSeedList = m_assetSeedManager->GetAssetSeedList();
@@ -1017,14 +1017,14 @@ namespace UnitTest
 
     TEST_F(AssetSeedManagerTest, Invalid_NotRemove_SeedForAllPlatform_Ok)
     {
-        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->AddSeedAsset(assets[0], AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
 
-        m_assetSeedManager->RemoveSeedAsset(assets[1].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset(assets[1].ToString<AZStd::string>(), AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& seedList = m_assetSeedManager->GetAssetSeedList();
 
         EXPECT_EQ(seedList.size(), 1);
 
-        m_assetSeedManager->RemoveSeedAsset("asset1.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_OSX);
+        m_assetSeedManager->RemoveSeedAsset("asset1.txt", AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_MAC);
         const AzFramework::AssetSeedList& secondSeedList = m_assetSeedManager->GetAssetSeedList();
         EXPECT_EQ(secondSeedList.size(), 1);
     }

Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp

@@ -184,13 +184,13 @@ namespace UnitTest
     TEST_F(PlatformAddressedAssetCatalogManagerTest, PlatformAddressedAssetCatalogManager_CatalogExistsChecks_Success)
     {
 
-        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ES3), true);
-        AZStd::string es3CatalogPath = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ES3);
-        if (AZ::IO::FileIOBase::GetInstance()->Exists(es3CatalogPath.c_str()))
+        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ANDROID_ID), true);
+        AZStd::string androidCatalogPath = AzToolsFramework::PlatformAddressedAssetCatalog::GetCatalogRegistryPathForPlatform(AzFramework::PlatformId::ANDROID_ID);
+        if (AZ::IO::FileIOBase::GetInstance()->Exists(androidCatalogPath.c_str()))
         {
-            AZ::IO::FileIOBase::GetInstance()->Remove(es3CatalogPath.c_str());
+            AZ::IO::FileIOBase::GetInstance()->Remove(androidCatalogPath.c_str());
         }
-        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ES3), false);
+        EXPECT_EQ(AzToolsFramework::PlatformAddressedAssetCatalog::CatalogExists(AzFramework::PlatformId::ANDROID_ID), false);
     }
 
     class PlatformAddressedAssetCatalogMessageTest : public AzToolsFramework::PlatformAddressedAssetCatalog
@@ -251,7 +251,7 @@ namespace UnitTest
         AzFramework::AssetSystem::NetworkAssetUpdateInterface* notificationInterface = AZ::Interface<AzFramework::AssetSystem::NetworkAssetUpdateInterface>::Get();
         EXPECT_NE(notificationInterface, nullptr);
 
-        auto* mockCatalog = new ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>(AzFramework::PlatformId::ES3);
+        auto* mockCatalog = new ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>(AzFramework::PlatformId::ANDROID_ID);
         AZStd::unique_ptr< ::testing::NiceMock<PlatformAddressedAssetCatalogMessageTest>> catalogHolder;
         catalogHolder.reset(mockCatalog);
 
@@ -259,7 +259,7 @@ namespace UnitTest
         EXPECT_CALL(*mockCatalog, AssetChanged(testing::_)).Times(0);
         notificationInterface->AssetChanged(testMessage);
 
-        testMessage.m_platform = "es3";
+        testMessage.m_platform = "android";
         EXPECT_CALL(*mockCatalog, AssetChanged(testing::_)).Times(1);
         notificationInterface->AssetChanged(testMessage);
 
@@ -270,7 +270,7 @@ namespace UnitTest
         EXPECT_CALL(*mockCatalog, AssetRemoved(testing::_)).Times(0);
         notificationInterface->AssetRemoved(testMessage);
 
-        testMessage.m_platform = "es3";
+        testMessage.m_platform = "android";
         EXPECT_CALL(*mockCatalog, AssetRemoved(testing::_)).Times(1);
         notificationInterface->AssetRemoved(testMessage);
     }

Code/Framework/Tests/PlatformHelper.cpp

@@ -30,11 +30,11 @@ TEST_F(PlatformHelperTest, SinglePlatformFlags_PlatformId_Valid)
 
 TEST_F(PlatformHelperTest, MultiplePlatformFlags_PlatformId_Valid)
 {
-    AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ES3;
+    AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID;
     auto platforms = AzFramework::PlatformHelper::GetPlatforms(platformFlags);
     EXPECT_EQ(platforms.size(), 2);
     EXPECT_EQ(platforms[0], "pc");
-    EXPECT_EQ(platforms[1], "es3");
+    EXPECT_EQ(platforms[1], "android");
 }
 
 TEST_F(PlatformHelperTest, SpecialAllFlag_PlatformId_Valid)
@@ -42,7 +42,7 @@ TEST_F(PlatformHelperTest, SpecialAllFlag_PlatformId_Valid)
     AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_ALL;
     auto platforms = AzFramework::PlatformHelper::GetPlatformsInterpreted(platformFlags);
     EXPECT_EQ(platforms.size(), AzFramework::NumPlatforms);
-    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "es3", "ios", "osx_gl", "provo", "salem", "jasper", "server"));
+    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "android", "ios", "mac", "provo", "salem", "jasper", "server"));
 }
 
 TEST_F(PlatformHelperTest, SpecialAllClientFlag_PlatformId_Valid)
@@ -50,7 +50,7 @@ TEST_F(PlatformHelperTest, SpecialAllClientFlag_PlatformId_Valid)
     AzFramework::PlatformFlags platformFlags = AzFramework::PlatformFlags::Platform_ALL_CLIENT;
     auto platforms = AzFramework::PlatformHelper::GetPlatformsInterpreted(platformFlags);
     EXPECT_EQ(platforms.size(), AzFramework::NumClientPlatforms);
-    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "es3", "ios", "osx_gl", "provo", "salem", "jasper"));
+    EXPECT_THAT(platforms, testing::UnorderedElementsAre("pc", "android", "ios", "mac", "provo", "salem", "jasper"));
 }
 
 TEST_F(PlatformHelperTest, InvalidPlatformFlags_PlatformId_Empty)

Code/Sandbox/Editor/CryEditPy.cpp

@@ -533,7 +533,7 @@ namespace AzToolsFramework
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
             behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_PC>("SystemConfigPlatform_Pc")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
-            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_OSX_GL>("SystemConfigPlatform_OsxGl")
+            behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_MAC>("SystemConfigPlatform_Mac")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);
             behaviorContext->EnumProperty<ESystemConfigPlatform::CONFIG_OSX_METAL>("SystemConfigPlatform_OsxMetal")
                 ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Automation);

Code/Tools/AssetBundler/tests/AssetProcessorPlatformConfig.setreg

@@ -3,7 +3,7 @@
         "AssetProcessor": {
             "Settings": {
                 "Platforms": {
-                    "es3": "enabled"
+                    "android": "enabled"
                 }
             }
         }

Code/Tools/AssetBundler/tests/applicationManagerTests.cpp

@@ -150,7 +150,7 @@ namespace AssetBundler
 
         AzFramework::PlatformFlags platformFlags = GetEnabledPlatformFlags(m_data->m_testEngineRoot.c_str(), m_data->m_testEngineRoot.c_str(), DummyProjectName);
         AzFramework::PlatformFlags hostPlatformFlag = AzFramework::PlatformHelper::GetPlatformFlag(AzToolsFramework::AssetSystem::GetHostAssetPlatform());
-        AzFramework::PlatformFlags expectedFlags = AzFramework::PlatformFlags::Platform_ES3 | AzFramework::PlatformFlags::Platform_IOS | AzFramework::PlatformFlags::Platform_PROVO | hostPlatformFlag;
+        AzFramework::PlatformFlags expectedFlags = AzFramework::PlatformFlags::Platform_ANDROID | AzFramework::PlatformFlags::Platform_IOS | AzFramework::PlatformFlags::Platform_PROVO | hostPlatformFlag;
         ASSERT_EQ(platformFlags, expectedFlags);
     }
 

Code/Tools/AssetBundler/tests/tests_main.cpp

@@ -40,14 +40,14 @@ namespace AssetBundler
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_MacFile_OutputBaseNameAndPlatform)
     {
-        AZStd::string filePath = "assetInfoFile_osx_gl.xml";
+        AZStd::string filePath = "assetInfoFile_mac.xml";
         AZStd::string baseFilename;
         AZStd::string platformIdentifier;
 
         AzToolsFramework::SplitFilename(filePath, baseFilename, platformIdentifier);
 
         ASSERT_EQ(baseFilename, "assetInfoFile");
-        ASSERT_EQ(platformIdentifier, "osx_gl");
+        ASSERT_EQ(platformIdentifier, "mac");
     }
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_PcFile_OutputBaseNameAndPlatform)
@@ -64,14 +64,14 @@ namespace AssetBundler
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_MacFileWithUnderScoreInFileName_OutputBaseNameAndPlatform)
     {
-        AZStd::string filePath = "assetInfoFile_test_osx_gl.xml";
+        AZStd::string filePath = "assetInfoFile_test_mac.xml";
         AZStd::string baseFilename;
         AZStd::string platformIdentifier;
 
         AzToolsFramework::SplitFilename(filePath, baseFilename, platformIdentifier);
 
         ASSERT_EQ(baseFilename, "assetInfoFile_test");
-        ASSERT_EQ(platformIdentifier, "osx_gl");
+        ASSERT_EQ(platformIdentifier, "mac");
     }
 
     TEST_F(AssetBundlerBatchUtilsTest, SplitFilename_PcFileWithUnderScoreInFileName_OutputBaseNameAndPlatform)

Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.cpp

@@ -78,17 +78,17 @@ namespace AssetBuilderSDK
         {
             return AssetBuilderSDK::Platform_PC;
         }
-        if (azstricmp(newPlatformName, "es3") == 0)
+        if (azstricmp(newPlatformName, "android") == 0)
         {
-            return AssetBuilderSDK::Platform_ES3;
+            return AssetBuilderSDK::Platform_ANDROID;
         }
         if (azstricmp(newPlatformName, "ios") == 0)
         {
             return AssetBuilderSDK::Platform_IOS;
         }
-        if (azstricmp(newPlatformName, "osx_gl") == 0)
+        if (azstricmp(newPlatformName, "mac") == 0)
         {
-            return AssetBuilderSDK::Platform_OSX;
+            return AssetBuilderSDK::Platform_MAC;
         }
         if (azstricmp(newPlatformName, "provo") == 0)
         {
@@ -115,12 +115,12 @@ namespace AssetBuilderSDK
         {
         case AssetBuilderSDK::Platform_PC:
             return "pc";
-        case AssetBuilderSDK::Platform_ES3:
-            return "es3";
+        case AssetBuilderSDK::Platform_ANDROID:
+            return "android";
         case AssetBuilderSDK::Platform_IOS:
             return "ios";
-        case AssetBuilderSDK::Platform_OSX:
-            return "osx_gl";
+        case AssetBuilderSDK::Platform_MAC:
+            return "mac";
         case AssetBuilderSDK::Platform_PROVO:
             return "provo";
         case AssetBuilderSDK::Platform_SALEM:

Code/Tools/AssetProcessor/AssetBuilderSDK/AssetBuilderSDK/AssetBuilderSDK.h

@@ -148,15 +148,15 @@ namespace AssetBuilderSDK
     {
         Platform_NONE       = 0x00,
         Platform_PC         = 0x01,
-        Platform_ES3        = 0x02,
+        Platform_ANDROID    = 0x02,
         Platform_IOS        = 0x04,
-        Platform_OSX        = 0x08,
+        Platform_MAC        = 0x08,
         Platform_PROVO      = 0x20,
         Platform_SALEM      = 0x40,
         Platform_JASPER     = 0x80,
 
         //! if you add a new platform entry to this enum, you must add it to allplatforms as well otherwise that platform would not be considered valid. 
-        AllPlatforms = Platform_PC | Platform_ES3 | Platform_IOS | Platform_OSX | Platform_PROVO | Platform_SALEM | Platform_JASPER
+        AllPlatforms = Platform_PC | Platform_ANDROID | Platform_IOS | Platform_MAC | Platform_PROVO | Platform_SALEM | Platform_JASPER
     };
 #endif // defined(ENABLE_LEGACY_PLATFORMFLAGS_SUPPORT)
     //! Map data structure to holder parameters that are passed into a job for ProcessJob requests.
@@ -503,7 +503,7 @@ namespace AssetBuilderSDK
         AZ_CLASS_ALLOCATOR(PlatformInfo, AZ::SystemAllocator, 0);
         AZ_TYPE_INFO(PlatformInfo, "{F7DA39A5-C319-4552-954B-3479E2454D3F}");
 
-        AZStd::string m_identifier; ///< like "pc" or "es3" or "ios"...
+        AZStd::string m_identifier; ///< like "pc" or "android" or "ios"...
         AZStd::unordered_set<AZStd::string> m_tags; ///< The tags like "console" or "tools" on that platform
 
         PlatformInfo() = default;

Code/Tools/AssetProcessor/native/tests/AssetCatalog/AssetCatalogUnitTests.cpp

@@ -240,7 +240,7 @@ namespace AssetProcessor
         void BuildConfig(const QDir& tempPath, AssetDatabaseConnection* dbConn, PlatformConfiguration& config)
         {
             config.EnablePlatform({ "pc" ,{ "desktop", "renderer" } }, true);
-            config.EnablePlatform({ "es3" ,{ "mobile", "renderer" } }, true);
+            config.EnablePlatform({ "android" ,{ "mobile", "renderer" } }, true);
             config.EnablePlatform({ "fandango" ,{ "console", "renderer" } }, false);
             AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
             config.PopulatePlatformsForScanFolder(platforms);
@@ -254,22 +254,22 @@ namespace AssetProcessor
 
             AssetRecognizer rec;
             AssetPlatformSpec specpc;
-            AssetPlatformSpec speces3;
+            AssetPlatformSpec specandroid;
 
-            speces3.m_extraRCParams = "somerandomparam";
+            specandroid.m_extraRCParams = "somerandomparam";
             rec.m_name = "random files";
             rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.random", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
             rec.m_platformSpecs.insert("pc", specpc);
             config.AddRecognizer(rec);
 
             specpc.m_extraRCParams = ""; // blank must work
-            speces3.m_extraRCParams = "testextraparams";
+            specandroid.m_extraRCParams = "testextraparams";
 
             const char* builderTxt1Name = "txt files";
             rec.m_name = builderTxt1Name;
             rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
             rec.m_platformSpecs.insert("pc", specpc);
-            rec.m_platformSpecs.insert("es3", speces3);
+            rec.m_platformSpecs.insert("android", specandroid);
 
             config.AddRecognizer(rec);
 
@@ -280,7 +280,7 @@ namespace AssetProcessor
             ignore_rec.m_name = "ignore files";
             ignore_rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.ignore", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
             ignore_rec.m_platformSpecs.insert("pc", specpc);
-            ignore_rec.m_platformSpecs.insert("es3", ignore_spec);
+            ignore_rec.m_platformSpecs.insert("android", ignore_spec);
             config.AddRecognizer(ignore_rec);
 
             ExcludeAssetRecognizer excludeRecogniser;
@@ -1092,7 +1092,7 @@ namespace AssetProcessor
         {
             AssetCatalogTest::SetUp();
             m_platforms.push_back("pc");
-            m_platforms.push_back("es3");
+            m_platforms.push_back("android");
 
             // 4 products for one platform, 1 product for the other.
             m_platformToProductsForSourceWithDifferentProducts["pc"].push_back("subfolder3/basefilez.arc2");
@@ -1100,7 +1100,7 @@ namespace AssetProcessor
             m_platformToProductsForSourceWithDifferentProducts["pc"].push_back("subfolder3/basefile.arc2");
             m_platformToProductsForSourceWithDifferentProducts["pc"].push_back("subfolder3/basefile.azm2");
 
-            m_platformToProductsForSourceWithDifferentProducts["es3"].push_back("subfolder3/es3exclusivefile.azm2");
+            m_platformToProductsForSourceWithDifferentProducts["android"].push_back("subfolder3/androidexclusivefile.azm2");
 
             m_sourceFileWithDifferentProductsPerPlatform = AZ::Uuid::CreateString("{38032FC9-2838-4D6A-9DA0-79E5E4F20C1B}");
             m_sourceFileWithDependency = AZ::Uuid::CreateString("{807C4174-1D19-42AD-B8BC-A59291D9388C}");
@@ -1113,7 +1113,7 @@ namespace AssetProcessor
             // resulting in image processing jobs having different products per platform. Because of this, the material jobs will then have different
             // dependencies per platform, because each material will depend on a referenced texture and all of that texture's mipmaps.
 
-            // Add a source file with 4 products on pc, but 1 on es3
+            // Add a source file with 4 products on pc, but 1 on android
             bool result = AddSourceAndJobForMultiplePlatforms(
                 "subfolder3",
                 "MultiplatformFile.txt",
@@ -1128,7 +1128,7 @@ namespace AssetProcessor
             result = AddSourceAndJobForMultiplePlatforms("subfolder3", "FileWithDependency.txt", &(m_data->m_dbConn), sourceFileWithSameProductsJobsPerPlatform, m_platforms, m_sourceFileWithDependency);
             EXPECT_TRUE(result);
 
-            const AZStd::string fileWithDependencyProductPath = "subfolder3/es3exclusivefile.azm2";
+            const AZStd::string fileWithDependencyProductPath = "subfolder3/androidexclusivefile.azm2";
 
             for (const AZStd::string& platform : m_platforms)
             {

Code/Tools/AssetProcessor/native/tests/assetBuilderSDK/assetBuilderSDKTest.cpp

@@ -28,7 +28,7 @@ namespace AssetProcessor
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformsCount(), 2);
@@ -48,19 +48,19 @@ namespace AssetProcessor
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
-            { "es3", {}
+            { "android", {}
             }
         };
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_PC);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(2), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
@@ -72,24 +72,24 @@ namespace AssetProcessor
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }, { "ios", {}
-            }, { "osx_gl", {}
+            }, { "mac", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_PC);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(2), AssetBuilderSDK::Platform_IOS);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(3), AssetBuilderSDK::Platform_OSX);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(3), AssetBuilderSDK::Platform_MAC);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(4), AssetBuilderSDK::Platform_NONE);
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(0), AssetBuilderSDK::Platform_PC);
-        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ES3);
+        ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(1), AssetBuilderSDK::Platform_ANDROID);
         ASSERT_EQ(createJobsRequest.GetEnabledPlatformAt(2), AssetBuilderSDK::Platform_NONE);
         // using a deprecated API should have generated warnings.
         // but we can't test for it because these warnings are WarningOnce and some other unit test might have already triggered it
@@ -106,23 +106,23 @@ namespace AssetProcessor
             }
         };
         ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_PC));
-        ASSERT_FALSE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ES3));
+        ASSERT_FALSE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ANDROID));
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_PC));
-        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ES3));
+        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ANDROID));
 
         createJobsRequest.m_enabledPlatforms = {
             { "pc", {}
-            }, { "es3", {}
+            }, { "android", {}
             }
         };
         ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_PC));
-        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ES3));
+        ASSERT_TRUE(createJobsRequest.IsPlatformEnabled(AssetBuilderSDK::Platform_ANDROID));
         // using a deprecated API should have generated warnings.
         // but we can't test for it because these warnings are WarningOnce and some other unit test might have already triggered it
     }
@@ -133,9 +133,9 @@ namespace AssetProcessor
         UnitTestUtils::AssertAbsorber absorb;
 
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_PC));
-        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_ES3));
+        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_ANDROID));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_IOS));
-        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_OSX));
+        ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_MAC));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_PROVO));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_SALEM));
         ASSERT_TRUE(createJobsRequest.IsPlatformValid(AssetBuilderSDK::Platform_JASPER));

Code/Tools/AssetProcessor/native/tests/assetmanager/AssetProcessorManagerTest.cpp

@@ -4020,15 +4020,15 @@ TEST_F(ModtimeScanningTest, ModtimeSkipping_EnablePlatform_ShouldProcessFilesFor
     m_assetProcessorManager->m_allowModtimeSkippingFeature = true;
     AssetUtilities::SetUseFileHashOverride(true, true);
 
-    // Enable es3 platform after the initial SetUp has already processed the files for pc
+    // Enable android platform after the initial SetUp has already processed the files for pc
     QDir tempPath(m_tempDir.path());
-    AssetBuilderSDK::PlatformInfo es3Platform("es3", { "host", "renderer" });
-    m_config->EnablePlatform(es3Platform, true);
+    AssetBuilderSDK::PlatformInfo androidPlatform("android", { "host", "renderer" });
+    m_config->EnablePlatform(androidPlatform, true);
 
     // There's no way to remove scanfolders and adding a new one after enabling the platform will cause the pc assets to build as well, which we don't want
     // Instead we'll just const cast the vector and modify the enabled platforms for the scanfolder
     auto& platforms = const_cast<AZStd::vector<AssetBuilderSDK::PlatformInfo>&>(m_config->GetScanFolderAt(0).GetPlatforms());
-    platforms.push_back(es3Platform);
+    platforms.push_back(androidPlatform);
 
     // We need the builder fingerprints to be updated to reflect the newly enabled platform
     m_assetProcessorManager->ComputeBuilderDirty();
@@ -4036,10 +4036,10 @@ TEST_F(ModtimeScanningTest, ModtimeSkipping_EnablePlatform_ShouldProcessFilesFor
     QSet<AssetFileInfo> filePaths = BuildFileSet();
     SimulateAssetScanner(filePaths);
 
-    ExpectWork(4, 2); // CreateJobs = 4, 2 files * 2 platforms.  ProcessJobs = 2, just the es3 platform jobs (pc is already processed)
+    ExpectWork(4, 2); // CreateJobs = 4, 2 files * 2 platforms.  ProcessJobs = 2, just the android platform jobs (pc is already processed)
 
-    ASSERT_TRUE(m_data->m_processResults[0].m_destinationPath.contains("es3"));
-    ASSERT_TRUE(m_data->m_processResults[1].m_destinationPath.contains("es3"));
+    ASSERT_TRUE(m_data->m_processResults[0].m_destinationPath.contains("android"));
+    ASSERT_TRUE(m_data->m_processResults[1].m_destinationPath.contains("android"));
 }
 
 TEST_F(ModtimeScanningTest, ModtimeSkipping_ModifyTimestamp)

Code/Tools/AssetProcessor/native/tests/platformconfiguration/platformconfigurationtests.cpp

@@ -120,14 +120,14 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Regular_Platforms)
 
     // verify the data.
     ASSERT_NE(config.GetPlatformByIdentifier(AzToolsFramework::AssetSystem::GetHostAssetPlatform()), nullptr);
-    ASSERT_NE(config.GetPlatformByIdentifier("es3"), nullptr);
+    ASSERT_NE(config.GetPlatformByIdentifier("android"), nullptr);
     ASSERT_NE(config.GetPlatformByIdentifier("server"), nullptr);
 
-    ASSERT_TRUE(config.GetPlatformByIdentifier("es3")->HasTag("mobile"));
-    ASSERT_TRUE(config.GetPlatformByIdentifier("es3")->HasTag("renderer"));
-    ASSERT_TRUE(config.GetPlatformByIdentifier("es3")->HasTag("android"));
+    ASSERT_TRUE(config.GetPlatformByIdentifier("android")->HasTag("mobile"));
+    ASSERT_TRUE(config.GetPlatformByIdentifier("android")->HasTag("renderer"));
+    ASSERT_TRUE(config.GetPlatformByIdentifier("android")->HasTag("android"));
     ASSERT_TRUE(config.GetPlatformByIdentifier("server")->HasTag("server"));
-    ASSERT_FALSE(config.GetPlatformByIdentifier("es3")->HasTag("server"));
+    ASSERT_FALSE(config.GetPlatformByIdentifier("android")->HasTag("server"));
     ASSERT_FALSE(config.GetPlatformByIdentifier("server")->HasTag("renderer"));
 }
 
@@ -397,7 +397,7 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularScanfolderP
     AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms = config.GetScanFolderAt(0).GetPlatforms();
     ASSERT_EQ(platforms.size(), 4);
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo(AzToolsFramework::AssetSystem::GetHostAssetPlatform(), AZStd::unordered_set<AZStd::string>{})) != platforms.end());
-    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("es3", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
+    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("android", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("ios", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("server", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
 
@@ -405,12 +405,12 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_RegularScanfolderP
     platforms = config.GetScanFolderAt(1).GetPlatforms();
     ASSERT_EQ(platforms.size(), 2);
     ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo(AzToolsFramework::AssetSystem::GetHostAssetPlatform(), AZStd::unordered_set<AZStd::string>{})) != platforms.end());
-    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("es3", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
+    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("android", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
 
     ASSERT_EQ(config.GetScanFolderAt(2).GetDisplayName(), QString("folder1output"));
     platforms = config.GetScanFolderAt(2).GetPlatforms();
     ASSERT_EQ(platforms.size(), 1);
-    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("es3", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
+    ASSERT_TRUE(AZStd::find(platforms.begin(), platforms.end(), AssetBuilderSDK::PlatformInfo("android", AZStd::unordered_set<AZStd::string>{})) != platforms.end());
 
     ASSERT_EQ(config.GetScanFolderAt(3).GetDisplayName(), QString("folder2output"));
     platforms = config.GetScanFolderAt(3).GetPlatforms();
@@ -454,7 +454,7 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Recognizers)
     using namespace AzToolsFramework::AssetSystem;
     using namespace AssetProcessor;
 #if defined(AZ_PLATFORM_WINDOWS)
-    const char* platformWhichIsNotCurrentPlatform = "osx_gl";
+    const char* platformWhichIsNotCurrentPlatform = "mac";
 #else
     const char* platformWhichIsNotCurrentPlatform = "pc";
 #endif
@@ -475,27 +475,27 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Recognizers)
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_pattern, "*.i_caf");
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_type, AssetBuilderSDK::AssetBuilderPattern::Wildcard);
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs.size(), 2);
-    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_FALSE(recogs["i_caf"].m_platformSpecs.contains("server")); // server has been set to skip.
-    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["es3"].m_extraRCParams, "mobile");
+    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["android"].m_extraRCParams, "mobile");
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "defaultparams");
 
     ASSERT_TRUE(recogs.contains("caf"));
-    ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains("server"));
     ASSERT_TRUE(recogs["caf"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_EQ(recogs["caf"].m_platformSpecs.size(), 3);
-    ASSERT_EQ(recogs["caf"].m_platformSpecs["es3"].m_extraRCParams, "rendererparams");
+    ASSERT_EQ(recogs["caf"].m_platformSpecs["android"].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["caf"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["caf"].m_platformSpecs["server"].m_extraRCParams, "copy");
 
     ASSERT_TRUE(recogs.contains("mov"));
-    ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains("server"));
     ASSERT_TRUE(recogs["mov"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_EQ(recogs["mov"].m_platformSpecs.size(), 3);
-    ASSERT_EQ(recogs["mov"].m_platformSpecs["es3"].m_extraRCParams, "platformspecificoverride");
+    ASSERT_EQ(recogs["mov"].m_platformSpecs["android"].m_extraRCParams, "platformspecificoverride");
     ASSERT_EQ(recogs["mov"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["mov"].m_platformSpecs["server"].m_extraRCParams, "copy");
 
@@ -503,27 +503,27 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Recognizers)
     // (but platforms can override it)
     ASSERT_TRUE(recogs.contains("rend"));
     ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
-    ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["rend"].m_platformSpecs.contains("server"));
     ASSERT_FALSE(recogs["rend"].m_platformSpecs.contains(platformWhichIsNotCurrentPlatform)); // this is not an enabled platform and should not be there.
     ASSERT_EQ(recogs["rend"].m_platformSpecs.size(), 3);
     ASSERT_EQ(recogs["rend"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "rendererparams");
-    ASSERT_EQ(recogs["rend"].m_platformSpecs["es3"].m_extraRCParams, "rendererparams");
+    ASSERT_EQ(recogs["rend"].m_platformSpecs["android"].m_extraRCParams, "rendererparams");
     ASSERT_EQ(recogs["rend"].m_platformSpecs["server"].m_extraRCParams, ""); // default if not specified is empty string
 
     ASSERT_TRUE(recogs.contains("alldefault"));
     ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
-    ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["alldefault"].m_platformSpecs.contains("server"));
     ASSERT_FALSE(recogs["alldefault"].m_platformSpecs.contains(platformWhichIsNotCurrentPlatform)); // this is not an enabled platform and should not be there.
     ASSERT_EQ(recogs["alldefault"].m_platformSpecs.size(), 3);
     ASSERT_EQ(recogs["alldefault"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "");
-    ASSERT_EQ(recogs["alldefault"].m_platformSpecs["es3"].m_extraRCParams, "");
+    ASSERT_EQ(recogs["alldefault"].m_platformSpecs["android"].m_extraRCParams, "");
     ASSERT_EQ(recogs["alldefault"].m_platformSpecs["server"].m_extraRCParams, "");
 
     ASSERT_TRUE(recogs.contains("skipallbutone"));
     ASSERT_FALSE(recogs["skipallbutone"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
-    ASSERT_FALSE(recogs["skipallbutone"].m_platformSpecs.contains("es3"));
+    ASSERT_FALSE(recogs["skipallbutone"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["skipallbutone"].m_platformSpecs.contains("server")); // server is only one enabled (set to copy)
     ASSERT_EQ(recogs["skipallbutone"].m_platformSpecs.size(), 1);
     ASSERT_EQ(recogs["skipallbutone"].m_platformSpecs["server"].m_extraRCParams, "copy");
@@ -549,7 +549,7 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Overrides)
 
     // verify the data.
     ASSERT_NE(config.GetPlatformByIdentifier(AzToolsFramework::AssetSystem::GetHostAssetPlatform()), nullptr);
-    ASSERT_NE(config.GetPlatformByIdentifier("es3"), nullptr);
+    ASSERT_NE(config.GetPlatformByIdentifier("android"), nullptr);
     ASSERT_NE(config.GetPlatformByIdentifier("provo"), nullptr);
     // this override swaps server with provo in that it turns ON provo, turns off server
     ASSERT_EQ(config.GetPlatformByIdentifier("server"), nullptr); // this should be off due to overrides
@@ -566,11 +566,11 @@ TEST_F(PlatformConfigurationUnitTests, TestFailReadConfigFile_Overrides)
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_pattern, "*.i_caf");
     ASSERT_EQ(recogs["i_caf"].m_patternMatcher.GetBuilderPattern().m_type, AssetBuilderSDK::AssetBuilderPattern::Wildcard);
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs.size(), 3);
-    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("es3"));
+    ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("android"));
     ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains("provo"));
     ASSERT_TRUE(recogs["i_caf"].m_platformSpecs.contains(AzToolsFramework::AssetSystem::GetHostAssetPlatform()));
     ASSERT_FALSE(recogs["i_caf"].m_platformSpecs.contains("server")); // server has been set to skip.
-    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["es3"].m_extraRCParams, "mobile");
+    ASSERT_EQ(recogs["i_caf"].m_platformSpecs["android"].m_extraRCParams, "mobile");
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs[AzToolsFramework::AssetSystem::GetHostAssetPlatform()].m_extraRCParams, "defaultparams");
     ASSERT_EQ(recogs["i_caf"].m_platformSpecs["provo"].m_extraRCParams, "copy");
 

Code/Tools/AssetProcessor/native/unittests/AssetProcessorManagerUnitTests.cpp

@@ -90,34 +90,34 @@ namespace AssetProcessor
             //AZ_TracePrintf("test", "-------------------------\n");
         }
 
-        void ComputeFingerprints(unsigned int& fingerprintForPC, unsigned int& fingerprintForES3, PlatformConfiguration& config, QString scanFolderPath, QString relPath)
+        void ComputeFingerprints(unsigned int& fingerprintForPC, unsigned int& fingerprintForANDROID, PlatformConfiguration& config, QString scanFolderPath, QString relPath)
         {
             QString extraInfoForPC;
-            QString extraInfoForES3;
+            QString extraInfoForANDROID;
             RecognizerPointerContainer output;
             QString filePath = scanFolderPath + "/" + relPath;
             config.GetMatchingRecognizers(filePath, output);
             for (const AssetRecognizer* assetRecogniser : output)
             {
                 extraInfoForPC.append(assetRecogniser->m_platformSpecs["pc"].m_extraRCParams);
-                extraInfoForES3.append(assetRecogniser->m_platformSpecs["es3"].m_extraRCParams);
+                extraInfoForANDROID.append(assetRecogniser->m_platformSpecs["android"].m_extraRCParams);
                 extraInfoForPC.append(assetRecogniser->m_version);
-                extraInfoForES3.append(assetRecogniser->m_version);
+                extraInfoForANDROID.append(assetRecogniser->m_version);
             }
 
-            //Calculating fingerprints for the file for pc and es3 platforms
+            //Calculating fingerprints for the file for pc and android platforms
             AZ::Uuid sourceId = AZ::Uuid("{2206A6E0-FDBC-45DE-B6FE-C2FC63020BD5}");
             JobEntry jobEntryPC(scanFolderPath, relPath, relPath, 0, { "pc", {"desktop", "renderer"} }, "", 0, 1, sourceId);
-            JobEntry jobEntryES3(scanFolderPath, relPath, relPath, 0, { "es3", {"mobile", "renderer"} }, "", 0, 2, sourceId);
+            JobEntry jobEntryANDROID(scanFolderPath, relPath, relPath, 0, { "android", {"mobile", "renderer"} }, "", 0, 2, sourceId);
 
             JobDetails jobDetailsPC;
             jobDetailsPC.m_extraInformationForFingerprinting = extraInfoForPC.toUtf8().constData();
             jobDetailsPC.m_jobEntry = jobEntryPC;
-            JobDetails jobDetailsES3;
-            jobDetailsES3.m_extraInformationForFingerprinting = extraInfoForES3.toUtf8().constData();
-            jobDetailsES3.m_jobEntry = jobEntryES3;
+            JobDetails jobDetailsANDROID;
+            jobDetailsANDROID.m_extraInformationForFingerprinting = extraInfoForANDROID.toUtf8().constData();
+            jobDetailsANDROID.m_jobEntry = jobEntryANDROID;
             fingerprintForPC = AssetUtilities::GenerateFingerprint(jobDetailsPC);
-            fingerprintForES3 = AssetUtilities::GenerateFingerprint(jobDetailsES3);
+            fingerprintForANDROID = AssetUtilities::GenerateFingerprint(jobDetailsANDROID);
         }
     }
 
@@ -242,7 +242,7 @@ namespace AssetProcessor
 
         PlatformConfiguration config;
         config.EnablePlatform({ "pc",{ "desktop", "renderer" } }, true);
-        config.EnablePlatform({ "es3",{ "mobile", "renderer" } }, true);
+        config.EnablePlatform({ "android",{ "mobile", "renderer" } }, true);
         config.EnablePlatform({ "fandago",{ "console", "renderer" } }, false);
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
@@ -261,9 +261,9 @@ namespace AssetProcessor
 
         AssetRecognizer rec;
         AssetPlatformSpec specpc;
-        AssetPlatformSpec speces3;
+        AssetPlatformSpec specandroid;
 
-        speces3.m_extraRCParams = "somerandomparam";
+        specandroid.m_extraRCParams = "somerandomparam";
         rec.m_name = "random files";
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.random", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
@@ -271,13 +271,13 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(mockAppManager.RegisterAssetRecognizerAsBuilder(rec));
 
         specpc.m_extraRCParams = ""; // blank must work
-        speces3.m_extraRCParams = "testextraparams";
+        specandroid.m_extraRCParams = "testextraparams";
 
         const char* builderTxt1Name = "txt files";
         rec.m_name = builderTxt1Name;
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
 
         config.AddRecognizer(rec);
 
@@ -307,21 +307,21 @@ namespace AssetProcessor
         rec.m_testLockSource = false;
 
         specpc.m_extraRCParams = "pcparams";
-        speces3.m_extraRCParams = "es3params";
+        specandroid.m_extraRCParams = "androidparams";
 
         rec.m_name = "xxx files";
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.xxx", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
         config.AddRecognizer(rec);
         mockAppManager.RegisterAssetRecognizerAsBuilder(rec);
 
         // two recognizers for the same pattern.
         rec.m_name = "xxx files 2 (builder2)";
         specpc.m_extraRCParams = "pcparams2";
-        speces3.m_extraRCParams = "es3params2";
+        specandroid.m_extraRCParams = "androidparams2";
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
         config.AddRecognizer(rec);
         mockAppManager.RegisterAssetRecognizerAsBuilder(rec);
 
@@ -332,7 +332,7 @@ namespace AssetProcessor
         ignore_rec.m_name = "ignore files";
         ignore_rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.ignore", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         ignore_rec.m_platformSpecs.insert("pc", specpc);
-        ignore_rec.m_platformSpecs.insert("es3", ignore_spec);
+        ignore_rec.m_platformSpecs.insert("android", ignore_spec);
         config.AddRecognizer(ignore_rec);
         mockAppManager.RegisterAssetRecognizerAsBuilder(ignore_rec);
 
@@ -434,7 +434,7 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 1); // 1, since we have one recognizer for .ignore, but the 'es3' platform is marked as skip
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 1); // 1, since we have one recognizer for .ignore, but the 'android' platform is marked as skip
         UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
 
@@ -457,16 +457,16 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
 
-        QList<int> es3JobsIndex;
+        QList<int> androidJobsIndex;
         QList<int> pcJobsIndex;
         for (int checkIdx = 0; checkIdx < 4; ++checkIdx)
         {
@@ -664,19 +664,19 @@ namespace AssetProcessor
         // ---------- test successes ----------
 
 
-        QStringList es3outs;
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefile.arc1")));
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefile.arc2")));
+        QStringList androidouts;
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefile.arc1")));
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefile.arc2")));
 
         // feed it the messages its waiting for (create the files)
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "products."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[1], "products."))
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "products."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[1], "products."))
 
-        //Invoke Asset Processed for es3 platform , txt files job description
+        //Invoke Asset Processed for android platform , txt files job description
         AssetBuilderSDK::ProcessJobResponse response;
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[1].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[1].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
 
         // make sure legacy SubIds get stored in the DB and in asset response messages.
         // also make sure they don't get filed for the wrong asset.
@@ -695,8 +695,8 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 1);
 
         // always RELATIVE, always with the product name.
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "android");
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "basefile.arc1");
         UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_data == "basefile.arc2");
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetChanged);
@@ -795,14 +795,14 @@ namespace AssetProcessor
         changedInputResults.clear();
         assetMessages.clear();
 
-        es3outs.clear();
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefile.azm")));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "products."));
+        androidouts.clear();
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefile.azm")));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "products."));
 
-        //Invoke Asset Processed for es3 platform , txt files2 job description
+        //Invoke Asset Processed for android platform , txt files2 job description
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
 
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
@@ -814,7 +814,7 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 1);
 
         // always RELATIVE, always with the product name.
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "basefile.azm");
 
         changedInputResults.clear();
@@ -1004,11 +1004,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1027,25 +1027,25 @@ namespace AssetProcessor
 
         // this time make different products:
 
-        QStringList oldes3outs;
+        QStringList oldandroidouts;
         QStringList oldpcouts;
-        oldes3outs = es3outs;
+        oldandroidouts = androidouts;
         oldpcouts.append(pcouts);
-        QStringList es3outs2;
+        QStringList androidouts2;
         QStringList pcouts2;
-        es3outs.clear();
+        androidouts.clear();
         pcouts.clear();
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefilea.arc1")));
-        es3outs2.push_back(cacheRoot.filePath(QString("es3/basefilea.azm")));
-        // note that the ES3 outs have changed
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefilea.arc1")));
+        androidouts2.push_back(cacheRoot.filePath(QString("android/basefilea.azm")));
+        // note that the android outs have changed
         // but the pc outs are still the same.
         pcouts.push_back(cacheRoot.filePath(QString("pc/basefile.arc1")));
         pcouts2.push_back(cacheRoot.filePath(QString("pc/basefile.azm")));
 
         // feed it the messages its waiting for (create the files)
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts[0], "newfile."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs2[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts2[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts2[0], "newfile."));
 
         QCoreApplication::processEvents(QEventLoop::AllEvents | QEventLoop::WaitForMoreEvents, 50);
@@ -1057,12 +1057,12 @@ namespace AssetProcessor
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1085,12 +1085,12 @@ namespace AssetProcessor
         // The files removed should be the ones we did not emit this time
         // note that order isn't guarantee but an example output it this
 
-        // [0] Removed: ES3, basefile.arc1
-        // [1] Removed: ES3, basefile.arc2
-        // [2] Changed: ES3, basefilea.arc1 (added)
+        // [0] Removed: ANDROID, basefile.arc1
+        // [1] Removed: ANDROID, basefile.arc2
+        // [2] Changed: ANDROID, basefilea.arc1 (added)
 
-        // [3] Removed: ES3, basefile.azm
-        // [4] Changed: ES3, basefilea.azm (added)
+        // [3] Removed: ANDROID, basefile.azm
+        // [4] Changed: ANDROID, basefilea.azm (added)
 
         // [5] changed: PC, basefile.arc1 (changed)
         // [6] changed: PC, basefile.azm (changed)
@@ -1112,18 +1112,18 @@ namespace AssetProcessor
             if (element.m_data == "basefilea.arc1")
             {
                 UNIT_TEST_EXPECT_TRUE(element.m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetChanged);
-                UNIT_TEST_EXPECT_TRUE(element.m_platform == "es3");
+                UNIT_TEST_EXPECT_TRUE(element.m_platform == "android");
             }
 
             if (element.m_data == "basefile.arc2")
             {
                 UNIT_TEST_EXPECT_TRUE(element.m_type == AzFramework::AssetSystem::AssetNotificationMessage::AssetRemoved);
-                UNIT_TEST_EXPECT_TRUE(element.m_platform == "es3");
+                UNIT_TEST_EXPECT_TRUE(element.m_platform == "android");
             }
         }
 
         // original products must no longer exist since it should have found and deleted them!
-        for (QString outFile: oldes3outs)
+        for (QString outFile: oldandroidouts)
         {
             UNIT_TEST_EXPECT_FALSE(QFile::exists(outFile));
         }
@@ -1147,11 +1147,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // pc and es3
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // pc and android
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1171,12 +1171,12 @@ namespace AssetProcessor
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1207,11 +1207,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1222,12 +1222,12 @@ namespace AssetProcessor
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1245,9 +1245,9 @@ namespace AssetProcessor
 
         // deleting the fingerprint file should not have erased the products
         UNIT_TEST_EXPECT_TRUE(QFile::exists(pcouts[0]));
-        UNIT_TEST_EXPECT_TRUE(QFile::exists(es3outs[0]));
+        UNIT_TEST_EXPECT_TRUE(QFile::exists(androidouts[0]));
         UNIT_TEST_EXPECT_TRUE(QFile::exists(pcouts2[0]));
-        UNIT_TEST_EXPECT_TRUE(QFile::exists(es3outs2[0]));
+        UNIT_TEST_EXPECT_TRUE(QFile::exists(androidouts2[0]));
 
         changedInputResults.clear();
         assetMessages.clear();
@@ -1306,9 +1306,9 @@ namespace AssetProcessor
         }
 
         UNIT_TEST_EXPECT_FALSE(QFile::exists(pcouts[0]));
-        UNIT_TEST_EXPECT_FALSE(QFile::exists(es3outs[0]));
+        UNIT_TEST_EXPECT_FALSE(QFile::exists(androidouts[0]));
         UNIT_TEST_EXPECT_FALSE(QFile::exists(pcouts2[0]));
-        UNIT_TEST_EXPECT_FALSE(QFile::exists(es3outs2[0]));
+        UNIT_TEST_EXPECT_FALSE(QFile::exists(androidouts2[0]));
 
         changedInputResults.clear();
         assetMessages.clear();
@@ -1323,28 +1323,28 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
 
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "newfile."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs2[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts2[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts2[0], "newfile."));
 
         // send both done messages simultaneously!
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData()));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData()));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         // send one failure only for PC :
@@ -1422,12 +1422,12 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(changedInputResults.size() == 3);
         UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 3);
 
-        // which should be for the ES3:
+        // which should be for the ANDROID:
         UNIT_TEST_EXPECT_TRUE(AssetUtilities::NormalizeFilePath(changedInputResults[0].first) == absolutePath);
 
         // always RELATIVE, always with the product name.
         UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_data == "basefilea.arc1" || assetMessages[0].m_data == "basefilea.azm");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
 
         for (auto& payload : payloadList)
         {
@@ -1528,28 +1528,28 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
 
-        es3outs.clear();
-        es3outs2.clear();
+        androidouts.clear();
+        androidouts2.clear();
         pcouts.clear();
         pcouts2.clear();
-        es3outs.push_back(cacheRoot.filePath(QString("es3/basefilez.arc2")));
-        es3outs2.push_back(cacheRoot.filePath(QString("es3/basefileaz.azm2")));
-        // note that the ES3 outs have changed
+        androidouts.push_back(cacheRoot.filePath(QString("android/basefilez.arc2")));
+        androidouts2.push_back(cacheRoot.filePath(QString("android/basefileaz.azm2")));
+        // note that the android outs have changed
         // but the pc outs are still the same.
         pcouts.push_back(cacheRoot.filePath(QString("pc/basefile.arc2")));
         pcouts2.push_back(cacheRoot.filePath(QString("pc/basefile.azm2")));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts[0], "newfile."));
-        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(es3outs2[0], "newfile."));
+        UNIT_TEST_EXPECT_TRUE(CreateDummyFile(androidouts2[0], "newfile."));
         UNIT_TEST_EXPECT_TRUE(CreateDummyFile(pcouts2[0], "newfile."));
         changedInputResults.clear();
         assetMessages.clear();
@@ -1557,12 +1557,12 @@ namespace AssetProcessor
         // send all the done messages simultaneously:
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 1));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[0].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
         response.m_resultCode = AssetBuilderSDK::ProcessJobResult_Success;
-        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(es3outs2[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
+        response.m_outputProducts.push_back(AssetBuilderSDK::JobProduct(androidouts2[0].toUtf8().constData(), AZ::Uuid::CreateNull(), 2));
         QMetaObject::invokeMethod(&apm, "AssetProcessed", Qt::QueuedConnection, Q_ARG(JobEntry, processResults[1].m_jobEntry), Q_ARG(AssetBuilderSDK::ProcessJobResponse, response));
 
         response.m_outputProducts.clear();
@@ -1622,11 +1622,11 @@ namespace AssetProcessor
         sortAssetToProcessResultList(processResults);
 
         // --------- same result as above ----------
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and es3,since we have two recognizer for .txt file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // 2 each for pc and android,since we have two recognizer for .txt file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_computedFingerprint != 0);
@@ -1647,9 +1647,9 @@ namespace AssetProcessor
         absolutePath = watchFolderPath + "/" + relativePathFromWatchFolder;
 
         unsigned int fingerprintForPC = 0;
-        unsigned int fingerprintForES3 = 0;
+        unsigned int fingerprintForANDROID = 0;
 
-        ComputeFingerprints(fingerprintForPC, fingerprintForES3, config, watchFolderPath, relativePathFromWatchFolder);
+        ComputeFingerprints(fingerprintForPC, fingerprintForANDROID, config, watchFolderPath, relativePathFromWatchFolder);
 
         processResults.clear();
         QMetaObject::invokeMethod(&apm, "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, absolutePath));
@@ -1657,11 +1657,11 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and es3,since we have two recognizer for .xxx file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and android,since we have two recognizer for .xxx file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
@@ -1683,11 +1683,11 @@ namespace AssetProcessor
         // we never actually submitted any fingerprints or indicated success, so the same number of jobs should occur as before
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and es3,since we have two recognizer for .xxx file
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 4); // // 2 each for pc and android,since we have two recognizer for .xxx file
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == processResults[1].m_jobEntry.m_platformInfo.m_identifier);
         UNIT_TEST_EXPECT_TRUE(processResults[2].m_jobEntry.m_platformInfo.m_identifier == processResults[3].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
         UNIT_TEST_EXPECT_TRUE((processResults[2].m_jobEntry.m_platformInfo.m_identifier == "pc"));
         UNIT_TEST_EXPECT_TRUE((processResults[3].m_jobEntry.m_platformInfo.m_identifier == "pc"));
 
@@ -1707,7 +1707,7 @@ namespace AssetProcessor
         // now re-perform the same test, this time only the pc ones should re-appear.
         // this should happen because we're changing the extra params, which should be part of the fingerprint
         // if this unit test fails, check to make sure that the extra params are being ingested into the fingerprint computation functions
-        // and also make sure that the jobs that are for the remaining es3 platform don't change.
+        // and also make sure that the jobs that are for the remaining android platform don't change.
 
         // store the UUID so that we can insert the new one with the same UUID
         AZStd::shared_ptr<InternalMockBuilder> builderTxt2Builder;
@@ -1745,12 +1745,12 @@ namespace AssetProcessor
         // ---------------------
 
         unsigned int newfingerprintForPC = 0;
-        unsigned int newfingerprintForES3 = 0;
+        unsigned int newfingerprintForANDROID = 0;
 
-        ComputeFingerprints(newfingerprintForPC, newfingerprintForES3, config, watchFolderPath, relativePathFromWatchFolder);
+        ComputeFingerprints(newfingerprintForPC, newfingerprintForANDROID, config, watchFolderPath, relativePathFromWatchFolder);
 
         UNIT_TEST_EXPECT_TRUE(newfingerprintForPC != fingerprintForPC);//Fingerprints should be different
-        UNIT_TEST_EXPECT_TRUE(newfingerprintForES3 == fingerprintForES3);//Fingerprints are same
+        UNIT_TEST_EXPECT_TRUE(newfingerprintForANDROID == fingerprintForANDROID);//Fingerprints are same
 
         config.RemoveRecognizer("xxx files 2 (builder2)");
         mockAppManager.UnRegisterAssetRecognizerAsBuilder("xxx files 2 (builder2)");
@@ -1765,18 +1765,18 @@ namespace AssetProcessor
         absolutePath = AssetUtilities::NormalizeFilePath(absolutePath);
         QMetaObject::invokeMethod(&apm, "AssessModifiedFile", Qt::QueuedConnection, Q_ARG(QString, absolutePath));
         UNIT_TEST_EXPECT_TRUE(BlockUntil(idling, 5000));
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // pc and es3
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // pc and android
         UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier != processResults[1].m_jobEntry.m_platformInfo.m_identifier);
-        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3"));
-        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[1].m_jobEntry.m_platformInfo.m_identifier == "es3"));
+        UNIT_TEST_EXPECT_TRUE((processResults[0].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android"));
+        UNIT_TEST_EXPECT_TRUE((processResults[1].m_jobEntry.m_platformInfo.m_identifier == "pc") || (processResults[1].m_jobEntry.m_platformInfo.m_identifier == "android"));
 
         unsigned int newfingerprintForPCAfterVersionChange = 0;
-        unsigned int newfingerprintForES3AfterVersionChange = 0;
+        unsigned int newfingerprintForANDROIDAfterVersionChange = 0;
 
-        ComputeFingerprints(newfingerprintForPCAfterVersionChange, newfingerprintForES3AfterVersionChange, config, watchFolderPath, relativePathFromWatchFolder);
+        ComputeFingerprints(newfingerprintForPCAfterVersionChange, newfingerprintForANDROIDAfterVersionChange, config, watchFolderPath, relativePathFromWatchFolder);
 
         UNIT_TEST_EXPECT_TRUE((newfingerprintForPCAfterVersionChange != fingerprintForPC) || (newfingerprintForPCAfterVersionChange != newfingerprintForPC));//Fingerprints should be different
-        UNIT_TEST_EXPECT_TRUE((newfingerprintForES3AfterVersionChange != fingerprintForES3) || (newfingerprintForES3AfterVersionChange != newfingerprintForES3));//Fingerprints should be different
+        UNIT_TEST_EXPECT_TRUE((newfingerprintForANDROIDAfterVersionChange != fingerprintForANDROID) || (newfingerprintForANDROIDAfterVersionChange != newfingerprintForANDROID));//Fingerprints should be different
 
         //------Test for Files which are excluded
         processResults.clear();
@@ -1921,7 +1921,7 @@ namespace AssetProcessor
 
         UNIT_TEST_EXPECT_TRUE(processResults.size() == 0); // nothing to process
 
-        // we are aware that 4 products went missing (es3 and pc versions of the 2 files since we renamed the SOURCE folder)
+        // we are aware that 4 products went missing (android and pc versions of the 2 files since we renamed the SOURCE folder)
         UNIT_TEST_EXPECT_TRUE(assetMessages.size() == 4);
         for (auto element : assetMessages)
         {
@@ -2180,8 +2180,8 @@ namespace AssetProcessor
         UNIT_TEST_EXPECT_TRUE(assetMessages[2].m_assetId != AZ::Data::AssetId());
         UNIT_TEST_EXPECT_TRUE(assetMessages[3].m_assetId != AZ::Data::AssetId());
 
-        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "es3");
-        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "es3");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[0].m_platform == "android");
+        UNIT_TEST_EXPECT_TRUE(assetMessages[1].m_platform == "android");
         UNIT_TEST_EXPECT_TRUE(assetMessages[2].m_platform == "pc");
         UNIT_TEST_EXPECT_TRUE(assetMessages[3].m_platform == "pc");
 
@@ -2214,12 +2214,12 @@ namespace AssetProcessor
         mockAppManager.UnRegisterAllBuilders();
 
         AssetRecognizer abt_rec1;
-        AssetPlatformSpec abt_speces3;
+        AssetPlatformSpec abt_specandroid;
         abt_rec1.m_name = "UnitTestTextBuilder1";
         abt_rec1.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         //abt_rec1.m_regexp.setPatternSyntax(QRegExp::Wildcard);
         //abt_rec1.m_regexp.setPattern("*.txt");
-        abt_rec1.m_platformSpecs.insert("es3", speces3);
+        abt_rec1.m_platformSpecs.insert("android", specandroid);
         mockAppManager.RegisterAssetRecognizerAsBuilder(abt_rec1);
 
         AssetRecognizer abt_rec2;
@@ -2268,8 +2268,8 @@ namespace AssetProcessor
 
         sortAssetToProcessResultList(processResults);
 
-        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // 1 for pc and es3
-        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == "es3");
+        UNIT_TEST_EXPECT_TRUE(processResults.size() == 2); // 1 for pc and android
+        UNIT_TEST_EXPECT_TRUE(processResults[0].m_jobEntry.m_platformInfo.m_identifier == "android");
         UNIT_TEST_EXPECT_TRUE(processResults[1].m_jobEntry.m_platformInfo.m_identifier == "pc");
         UNIT_TEST_EXPECT_TRUE(QString::compare(processResults[0].m_jobEntry.GetAbsoluteSourcePath(), absolutePath, Qt::CaseInsensitive) == 0);
         UNIT_TEST_EXPECT_TRUE(QString::compare(processResults[1].m_jobEntry.GetAbsoluteSourcePath(), absolutePath, Qt::CaseInsensitive) == 0);

Code/Tools/AssetProcessor/native/unittests/ConnectionUnitTests.cpp

@@ -17,16 +17,16 @@ void ConnectionUnitTest::StartTest()
     m_testConnection.SetAssetPlatformsString("pc");
     AzFramework::AssetSystem::AssetNotificationMessage testMessage;
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(0);
-    m_testConnection.SendPerPlatform(0, testMessage, "osx_gl");
+    m_testConnection.SendPerPlatform(0, testMessage, "mac");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(1);
     m_testConnection.SendPerPlatform(0, testMessage, "pc");
-    m_testConnection.SetAssetPlatformsString("pc,es3");
+    m_testConnection.SetAssetPlatformsString("pc,android");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(1);
     m_testConnection.SendPerPlatform(0, testMessage, "pc");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(0);
-    m_testConnection.SendPerPlatform(0, testMessage, "osx_gl");
+    m_testConnection.SendPerPlatform(0, testMessage, "mac");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(1);
-    m_testConnection.SendPerPlatform(0, testMessage, "es3");
+    m_testConnection.SendPerPlatform(0, testMessage, "android");
     EXPECT_CALL(m_testConnection, Send(testing::_, testing::_)).Times(0);
     // Intended partial string match test - shouldn't send
     m_testConnection.SendPerPlatform(0, testMessage, "es");

Code/Tools/AssetProcessor/native/unittests/MockConnectionHandler.h

@@ -63,7 +63,7 @@ namespace AssetProcessor
 
         size_t SendPerPlatform(unsigned int serial, const AzFramework::AssetSystem::BaseAssetProcessorMessage& message, const QString& platform) override
         {
-            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "es3", Qt::CaseInsensitive) == 0)
+            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "android", Qt::CaseInsensitive) == 0)
             {
                 return Send(serial, message);
             }
@@ -72,7 +72,7 @@ namespace AssetProcessor
 
         size_t SendRawPerPlatform(unsigned int type, unsigned int serial, const QByteArray& data, const QString& platform) override
         {
-            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "es3", Qt::CaseInsensitive) == 0)
+            if (QString::compare(platform, "pc", Qt::CaseInsensitive) == 0 || QString::compare(platform, "android", Qt::CaseInsensitive) == 0)
             {
                 return SendRaw(type, serial, data);
             }

Code/Tools/AssetProcessor/native/unittests/PlatformConfigurationUnitTests.cpp

@@ -64,7 +64,7 @@ void PlatformConfigurationTests::StartTest()
 
         PlatformConfiguration config;
         config.EnablePlatform({ "pc",{ "desktop", "host" } }, true);
-        config.EnablePlatform({ "es3",{ "mobile", "android" } }, true);
+        config.EnablePlatform({ "android",{ "mobile", "android" } }, true);
         config.EnablePlatform({ "fandago",{ "console" } }, false);
         AZStd::vector<AssetBuilderSDK::PlatformInfo> platforms;
         config.PopulatePlatformsForScanFolder(platforms);
@@ -88,15 +88,15 @@ void PlatformConfigurationTests::StartTest()
 
         AssetRecognizer rec;
         AssetPlatformSpec specpc;
-        AssetPlatformSpec speces3;
+        AssetPlatformSpec specandroid;
         AssetPlatformSpec specfandago; 
         specpc.m_extraRCParams = ""; // blank must work
-        speces3.m_extraRCParams = "testextraparams";
+        specandroid.m_extraRCParams = "testextraparams";
 
         rec.m_name = "txt files";
         rec.m_patternMatcher = AssetBuilderSDK::FilePatternMatcher("*.txt", AssetBuilderSDK::AssetBuilderPattern::Wildcard);
         rec.m_platformSpecs.insert("pc", specpc);
-        rec.m_platformSpecs.insert("es3", speces3);
+        rec.m_platformSpecs.insert("android", specandroid);
         rec.m_platformSpecs.insert("fandago", specfandago); 
         config.AddRecognizer(rec);
 
@@ -111,7 +111,7 @@ void PlatformConfigurationTests::StartTest()
 
         UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms().size() == 2);
         UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms()[0].m_identifier == "pc");
-        UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms()[1].m_identifier == "es3");
+        UNIT_TEST_EXPECT_TRUE(config.GetEnabledPlatforms()[1].m_identifier == "android");
 
         UNIT_TEST_EXPECT_TRUE(config.GetScanFolderCount() == 11);
         UNIT_TEST_EXPECT_FALSE(config.GetScanFolderAt(0).IsRoot());

Code/Tools/AssetProcessor/native/unittests/RCcontrollerUnitTests.cpp

@@ -239,14 +239,14 @@ void RCcontrollerUnitTests::RunRCControllerTests()
         createdJobs.push_back(job);
     }
 
-    // double them up for "es3" to make sure that platform is respected
+    // double them up for "android" to make sure that platform is respected
     for (QString name : tempJobNames)
     {
         AZ::Uuid uuidOfSource = AZ::Uuid::CreateName(name.toUtf8().constData());
         RCJob* job0 = new RCJob(rcJobListModel);
         AssetProcessor::JobDetails jobDetails;
         jobDetails.m_jobEntry.m_databaseSourceName = jobDetails.m_jobEntry.m_pathRelativeToWatchFolder = name;
-        jobDetails.m_jobEntry.m_platformInfo = { "es3" ,{ "mobile", "renderer" } };
+        jobDetails.m_jobEntry.m_platformInfo = { "android" ,{ "mobile", "renderer" } };
         jobDetails.m_jobEntry.m_jobKey = "Compile Other Stuff";
         jobDetails.m_jobEntry.m_sourceFileUUID = uuidOfSource;
         job0->Init(jobDetails);
@@ -490,7 +490,7 @@ void RCcontrollerUnitTests::RunRCControllerTests()
     UNIT_TEST_EXPECT_FALSE(gotJobsInQueueCall);
 
     // submit same job but different platform:
-    details.m_jobEntry = JobEntry("d:/test", "test1.txt", "test1.txt", AZ::Uuid("{7954065D-CFD1-4666-9E4C-3F36F417C7AC}"), { "es3" ,{ "mobile", "renderer" } }, "Test Job", 1234, 3, sourceId);
+    details.m_jobEntry = JobEntry("d:/test", "test1.txt", "test1.txt", AZ::Uuid("{7954065D-CFD1-4666-9E4C-3F36F417C7AC}"), { "android" ,{ "mobile", "renderer" } }, "Test Job", 1234, 3, sourceId);
     m_rcController.JobSubmitted(details);
     QCoreApplication::processEvents(QEventLoop::AllEvents);
 

Code/Tools/AssetProcessor/native/unittests/UnitTestRunner.cpp

@@ -54,7 +54,7 @@ namespace UnitTestUtils
 {
     void SleepForMinimumFileSystemTime()
     {
-        // note that on OSX, the file system has a resolution of 1 second, and since we're using modtime for a bunch of things, 
+        // note that on Mac, the file system has a resolution of 1 second, and since we're using modtime for a bunch of things, 
         // not the actual hash files, we have to wait different amount depending on the OS.
 #ifdef AZ_PLATFORM_WINDOWS
         int milliseconds = 1;

Code/Tools/AssetProcessor/testdata/config_broken_badplatform/AssetProcessorPlatformConfig.setreg

@@ -5,11 +5,11 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "Platforms": {
-                    "es3": "enabled"
+                    "android": "enabled"
                 },
                 "ScanFolder Game": {
                     "watch": "@PROJECTROOT@",

Code/Tools/AssetProcessor/testdata/config_broken_noscans/AssetProcessorPlatformConfig.setreg

@@ -5,7 +5,7 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "RC i_caf": {

Code/Tools/AssetProcessor/testdata/config_broken_recognizers/AssetProcessorPlatformConfig.setreg

@@ -5,7 +5,7 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "ScanFolder Game": {

Code/Tools/AssetProcessor/testdata/config_regular/AssetProcessorPlatformConfig.setreg

@@ -5,17 +5,17 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform es3": {
+                "Platform android": {
                     "tags": "android,mobile,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "Platform server": {
                     "tags": "server"
                 },
                 "Platforms": {
-                    "es3": "enabled",
+                    "android": "enabled",
                     "server": "enabled"
                 },
                 "Jobs": {
@@ -56,7 +56,7 @@
                     "glob": "*.i_caf",
                     "params": "defaultparams",
                     "server": "skip",
-                    "es3": "mobile",
+                    "android": "mobile",
                     "priority": 5,
                     "checkServer": true
                 },
@@ -68,7 +68,7 @@
                 "RC mov": {
                     "glob": "*.mov",
                     "params": "copy",
-                    "es3": "platformspecificoverride",
+                    "android": "platformspecificoverride",
                     "renderer": "rendererparams"
                 },
                 "RC rend": {

Code/Tools/AssetProcessor/testdata/config_regular_platform_scanfolder/AssetProcessorPlatformConfig.setreg

@@ -5,13 +5,13 @@
                 "Platform pc": {
                     "tags": "tools,renderer"
                 },
-                "Platform es3": {
+                "Platform android": {
                     "tags": "android,mobile,renderer"
                 },
                 "Platform ios": {
                     "tags": "mobile,renderer"
                 },
-                "Platform osx_gl": {
+                "Platform mac": {
                     "tags": "tools,renderer"
                 },
                 "Platform server": {
@@ -21,7 +21,7 @@
                     "tags": "console,renderer"
                 },
                 "Platforms": {
-                    "es3": "enabled",
+                    "android": "enabled",
                     "ios": "enabled",
                     "server": "enabled"
                 },
@@ -54,14 +54,14 @@
                     "display": "folder1output",
                     "recursive": 1,
                     "order": 50000,
-                    "include": "es3"
+                    "include": "android"
                 },
                 "ScanFolder Folder2": {
                     "watch": "@ENGINEROOT@/Folder2",
                     "display": "folder2output",
                     "recursive": 1,
                     "order": 60000,
-                    "exclude": "es3"
+                    "exclude": "android"
                 },
                 "ScanFolder Folder3": {
                     "watch": "@ENGINEROOT@/Folder3",
@@ -80,7 +80,7 @@
                     "glob": "*.i_caf",
                     "params": "defaultparams",
                     "server": "skip",
-                    "es3": "mobile",
+                    "android": "mobile",
                     "test": "copy",
                     "priority": 5
                 },
@@ -92,7 +92,7 @@
                 "RC mov": {
                     "glob": "*.mov",
                     "params": "copy",
-                    "es3": "platformspecificoverride",
+                    "android": "platformspecificoverride",
                     "renderer": "rendererparams"
                 },
                 "RC rend": {

Code/Tools/GridHub/GridHub/gridhub.cpp

@@ -552,7 +552,7 @@ GridHubComponent::OnMemberJoined([[maybe_unused]] GridMate::GridSession* session
     switch( member->GetPlatformId() )
     {
     case AZ::PlatformID::PLATFORM_WINDOWS_64:
-    case AZ::PlatformID::PLATFORM_APPLE_OSX:
+    case AZ::PlatformID::PLATFORM_APPLE_MAC:
         {
             GridMate::string localMachineName = GridMate::Utils::GetMachineAddress();
             if( member->GetMachineName() == localMachineName )

Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp

@@ -108,11 +108,11 @@ namespace ImageProcessingAtomEditor
         {
             readableString = "PC";
         }
-        else if (platformStrLowerCase == "es3")
+        else if (platformStrLowerCase == "android")
         {
             readableString = "Android";
         }
-        else if (platformStrLowerCase == "osx_gl")
+        else if (platformStrLowerCase == "mac")
         {
             readableString = "macOS";
         }

Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Mac/ImageProcessing_Traits_Mac.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #define AZ_TRAIT_IMAGEPROCESSING_BESSEL_FUNCTION_FIRST_ORDER j1
-#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "osx_gl"
+#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "mac"
 #define AZ_TRAIT_IMAGEPROCESSING_DEFINE_DIRECT3D_CONSTANTS 1
 #define AZ_TRAIT_IMAGEPROCESSING_PVRTEXLIB_USE_WINDLL_IMPORT 0
 #define AZ_TRAIT_IMAGEPROCESSING_SQUISH_DO_NOT_USE_FASTCALL 1

Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/iOS/ImageProcessing_Traits_iOS.h

@@ -12,7 +12,7 @@
 #pragma once
 
 #define AZ_TRAIT_IMAGEPROCESSING_BESSEL_FUNCTION_FIRST_ORDER j1
-#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "osx_gl"
+#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "mac"
 #define AZ_TRAIT_IMAGEPROCESSING_DEFINE_DIRECT3D_CONSTANTS 1
 #define AZ_TRAIT_IMAGEPROCESSING_PVRTEXLIB_USE_WINDLL_IMPORT 0
 #define AZ_TRAIT_IMAGEPROCESSING_SQUISH_DO_NOT_USE_FASTCALL 1

Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/TestAssets/1024x1024_24bit.tif.exportsettings

@@ -1 +1 @@
-/autooptimizefile=0 /bumptype=none /M=62,18,32,83,50,50 /preset=Diffuse_highQ /mipgentype=kaiser /reduce="es3:0,ios:3,osx_gl:0,pc:4,provo:1" /ser=0
+/autooptimizefile=0 /bumptype=none /M=62,18,32,83,50,50 /preset=Diffuse_highQ /mipgentype=kaiser /reduce="android:0,ios:3,mac:0,pc:4,provo:1" /ser=0

Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset

@@ -25,7 +25,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",
@@ -67,7 +67,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{08A95286-ADB2-41E4-96EB-DB48F4726D6A}",
                 "Name": "Albedo",
                 "RGB_Weight": "CIEXYZ",

Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset

@@ -23,7 +23,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",
@@ -61,7 +61,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{57ED16B1-407B-4E29-BCFC-D3BAE60F2C85}",
                 "Name": "AlbedoWithCoverage",
                 "RGB_Weight": "CIEXYZ",

Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset

@@ -23,7 +23,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",
@@ -61,7 +61,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{5D9ECB52-4CD9-4CB8-80E3-10CAE5EFB8A2}",
                 "Name": "AlbedoWithGenericAlpha",
                 "RGB_Weight": "CIEXYZ",

Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset

@@ -23,7 +23,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
                 "Name": "AlbedoWithOpacity",
                 "RGB_Weight": "CIEXYZ",
@@ -61,7 +61,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{7BB7BC6C-D3DA-4184-AC42-BCD8C57DE565}",
                 "Name": "AlbedoWithOpacity",
                 "RGB_Weight": "CIEXYZ",

Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset

@@ -17,7 +17,7 @@
             "PixelFormat": "BC4"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}",
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",
@@ -43,7 +43,7 @@
                 ],
                 "PixelFormat": "EAC_R11"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}",
                 "Name": "AmbientOcclusion",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset

@@ -11,7 +11,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
                 "Name": "CloudShadows",
                 "DestColor": "Linear",
@@ -25,7 +25,7 @@
                 "PixelFormat": "EAC_R11",
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
                 "Name": "CloudShadows",
                 "DestColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/ColorChart.preset

@@ -15,7 +15,7 @@
             "IsColorChart": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
                 "Name": "ColorChart",
                 "SourceColor": "Linear",
@@ -37,7 +37,7 @@
                 "PixelFormat": "R8G8B8X8",
                 "IsColorChart": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{0A17A85F-07EE-48A0-8BF8-D42F0A5E0B3C}",
                 "Name": "ColorChart",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/ConvolvedCubemap.preset

@@ -30,7 +30,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{2174E04B-73BB-4DF1-8961-4900DC3C9D72}",
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",
@@ -82,7 +82,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{2174E04B-73BB-4DF1-8961-4900DC3C9D72}",
                 "Name": "ConvolvedCubemap",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset

@@ -18,7 +18,7 @@
             "NumberResidentMips": 255
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
                 "FileMasks": [
@@ -46,7 +46,7 @@
                 // Decal Texture Arrays need all mips available immediately for packing. 
                 "NumberResidentMips": 255                       
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",
                 "Name": "Decal_AlbedoWithOpacity",
                 "FileMasks": [

Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset

@@ -18,7 +18,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness",
                 "SourceColor": "Linear",
@@ -46,7 +46,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{5096FC7B-0B2D-4466-9943-AD59922968E8}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness_Lossless.preset

@@ -17,7 +17,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
                 "SourceColor": "Linear",
@@ -43,7 +43,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{B6FC1AEF-907C-4157-9A1A-D9960F0E5B9A}",
                 "Name": "Detail_MergedAlbedoNormalsSmoothness_Lossless",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset

@@ -28,7 +28,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{D7B4BEA6-6427-4295-B61B-62776D0056DE}",
                 "Name": "Displacement",
                 "SourceColor": "Linear",
@@ -77,7 +77,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{D7B4BEA6-6427-4295-B61B-62776D0056DE}",
                 "Name": "Displacement",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset

@@ -18,7 +18,7 @@
             "DiscardAlpha": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",
@@ -46,7 +46,7 @@
                 "PixelFormat": "ASTC_6x6",
                 "DiscardAlpha": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{07041D83-E0C3-4726-8735-CA0FE550C9A0}",
                 "Name": "Emissive",
                 "RGB_Weight": "CIEXYZ",

Gems/Atom/Asset/ImageProcessingAtom/Config/Gradient.preset

@@ -11,7 +11,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{0D26B387-2FBA-456D-AB8E-613020BCC7F8}",
                 "Name": "Gradient",
                 "SourceColor": "Linear",
@@ -25,7 +25,7 @@
                 "DestColor": "Linear",
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{0D26B387-2FBA-456D-AB8E-613020BCC7F8}",
                 "Name": "Gradient",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset

@@ -18,7 +18,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{B6B04FD3-BD7B-44AC-AD93-6FECD2BD4D76}",
                 "Name": "Greyscale",
                 "SourceColor": "Linear",
@@ -46,7 +46,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{B6B04FD3-BD7B-44AC-AD93-6FECD2BD4D76}",
                 "Name": "Greyscale",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/IBLDiffuse.preset

@@ -28,7 +28,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
                 "FileMasks": [
@@ -74,7 +74,7 @@
                     "SubId": 3000
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}",
                 "Name": "IBLDiffuse",
                 "FileMasks": [

Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSkybox.preset

@@ -26,7 +26,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
                 "FileMasks": [
@@ -68,7 +68,7 @@
                     "IBLDiffusePreset": "{E3706342-BF21-4D9C-AE28-9670EB3EF3C5}"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E6441EAC-9843-484B-8EFC-C03B2935B48D}",
                 "Name": "IBLSkybox",
                 "FileMasks": [

Gems/Atom/Asset/ImageProcessingAtom/Config/IBLSpecular.preset

@@ -30,7 +30,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
                 "FileMasks": [
@@ -80,7 +80,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{908DA68C-97FB-4C4A-97BC-5A55F30F14FA}",
                 "Name": "IBLSpecular",
                 "FileMasks": [

Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings

@@ -5,7 +5,7 @@
     "ClassData": {
         "AnalysisFingerprint": "2",
         "BuildSettings": {
-            "es3": {
+            "android": {
                 "GlossScale": 16.0,
                 "GlossBias": 0.0,
                 "Streaming": false,
@@ -17,7 +17,7 @@
                 "Streaming": false,
                 "Enable": true
             },
-            "osx_gl": {
+            "mac": {
                 "GlossScale": 16.0,
                 "GlossBias": 0.0,
                 "Streaming": false,

Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG16.preset

@@ -11,7 +11,7 @@
             "PixelFormat": "R16G16"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{D55CBCD3-AF2D-4515-98AB-E278F6B3B5F6}",
                 "Name": "LUT_RG16",
                 "SourceColor": "Linear",
@@ -25,7 +25,7 @@
                 "DestColor": "Linear",
                 "PixelFormat": "R16G16"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{D55CBCD3-AF2D-4515-98AB-E278F6B3B5F6}",
                 "Name": "LUT_RG16",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG32F.preset

@@ -12,7 +12,7 @@
             "PixelFormat": "R32G32F"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{52470B8B-0798-4E03-B0D3-039D5141CFEC}",
                 "Name": "LUT_RG32F",
                 "SourceColor": "Linear",
@@ -26,7 +26,7 @@
                 "DestColor": "Linear",
                 "PixelFormat": "R32G32F"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{52470B8B-0798-4E03-B0D3-039D5141CFEC}",
                 "Name": "LUT_RG32F",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RG8.preset

@@ -14,7 +14,7 @@
             "PixelFormat": "R8G8"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{3791319D-043B-4011-8B6F-3DE96D0C4309}",
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",
@@ -34,7 +34,7 @@
                 ],
                 "PixelFormat": "R8G8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{3791319D-043B-4011-8B6F-3DE96D0C4309}",
                 "Name": "LUT_RG8",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA32F.preset

@@ -12,7 +12,7 @@
             "PixelFormat": "R32G32B32A32F"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{AC4C49D4-2C70-425A-8DBF-E7FB2C61CF8D}",
                 "Name": "LUT_RGBA32F",
                 "SourceColor": "Linear",
@@ -26,7 +26,7 @@
                 "DestColor": "Linear",
                 "PixelFormat": "R32G32B32A32F"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{AC4C49D4-2C70-425A-8DBF-E7FB2C61CF8D}",
                 "Name": "LUT_RGBA32F",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/LUT_RGBA8.preset

@@ -10,7 +10,7 @@
             "DestColor": "Linear"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{3A6BB297-B610-4EA5-8DA4-610FB12B9EC0}",
                 "Name": "LUT_RGBA8",
                 "SourceColor": "Linear",
@@ -22,7 +22,7 @@
                 "SourceColor": "Linear",
                 "DestColor": "Linear"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{3A6BB297-B610-4EA5-8DA4-610FB12B9EC0}",
                 "Name": "LUT_RGBA8",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/LayerMask.preset

@@ -15,7 +15,7 @@
             "PixelFormat": "R8G8B8X8"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{B1AC2F76-CB1A-46A8-B92D-B8DFBB564FCF}",
                 "Name": "LayerMask",
                 "SourceColor": "Linear",
@@ -37,7 +37,7 @@
                 ],
                 "PixelFormat": "R8G8B8X8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{B1AC2F76-CB1A-46A8-B92D-B8DFBB564FCF}",
                 "Name": "LayerMask",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset

@@ -9,7 +9,7 @@
             "PixelFormat": "BC1"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
                 "Name": "LensOptics",
                 "PixelFormat": "ETC2"
@@ -19,7 +19,7 @@
                 "Name": "LensOptics",
                 "PixelFormat": "ASTC_4x4"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
                 "Name": "LensOptics",
                 "PixelFormat": "BC1"

Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset

@@ -14,7 +14,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
                 "Name": "LightProjector",
                 "DestColor": "Linear",
@@ -34,7 +34,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
                 "Name": "LightProjector",
                 "DestColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/LoadingScreen.preset

@@ -9,7 +9,7 @@
             "PixelFormat": "R8G8B8X8"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
                 "Name": "LoadingScreen",
                 "PixelFormat": "R8G8B8X8"
@@ -19,7 +19,7 @@
                 "Name": "LoadingScreen",
                 "PixelFormat": "R8G8B8X8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{9ED87726-12AB-4BE0-9397-AD62AE56D9E2}",
                 "Name": "LoadingScreen",
                 "PixelFormat": "R8G8B8X8"

Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset

@@ -15,7 +15,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
                 "Name": "Minimap",
                 "SuppressEngineReduce": true,
@@ -37,7 +37,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
                 "Name": "Minimap",
                 "SuppressEngineReduce": true,

Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset

@@ -14,7 +14,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
                 "Name": "MuzzleFlash",
                 "SuppressEngineReduce": true,
@@ -34,7 +34,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
                 "Name": "MuzzleFlash",
                 "SuppressEngineReduce": true,

Gems/Atom/Asset/ImageProcessingAtom/Config/Normals.preset

@@ -27,7 +27,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{508B21D5-5250-4003-97EC-1CF28D571ACF}",
                 "Name": "Normals",
                 "SourceColor": "Linear",
@@ -75,7 +75,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{508B21D5-5250-4003-97EC-1CF28D571ACF}",
                 "Name": "Normals",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset

@@ -19,7 +19,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
                 "Name": "NormalsFromDisplacement",
                 "SourceColor": "Linear",
@@ -49,7 +49,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{8AE5D8D7-ECF8-4B7D-91DE-8F787E3B4210}",
                 "Name": "NormalsFromDisplacement",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset

@@ -25,7 +25,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{6EE749F4-846E-4F7A-878C-F211F85EA59F}",
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",
@@ -67,7 +67,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{6EE749F4-846E-4F7A-878C-F211F85EA59F}",
                 "Name": "NormalsWithSmoothness",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset

@@ -22,7 +22,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
                 "Name": "NormalsWithSmoothness_Legacy",
                 "SourceColor": "Linear",
@@ -58,7 +58,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{A92541B8-2E70-4EF1-BA88-1DC1EA2A2341}",
                 "Name": "NormalsWithSmoothness_Legacy",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset

@@ -27,7 +27,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{F3D5E572-A3CF-435A-A2AB-75D2B6907847}",
                 "Name": "Opacity",
                 "SourceColor": "Linear",
@@ -73,7 +73,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{F3D5E572-A3CF-435A-A2AB-75D2B6907847}",
                 "Name": "Opacity",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage.preset

@@ -8,7 +8,7 @@
             "Name": "ReferenceImage"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{C659D222-F56B-4B61-A2F8-C1FA547F3C39}",
                 "Name": "ReferenceImage"
             },
@@ -16,7 +16,7 @@
                 "UUID": "{C659D222-F56B-4B61-A2F8-C1FA547F3C39}",
                 "Name": "ReferenceImage"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{C659D222-F56B-4B61-A2F8-C1FA547F3C39}",
                 "Name": "ReferenceImage"
             },

Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinear.preset

@@ -13,7 +13,7 @@
             "DiscardAlpha": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{46D9F30F-793C-4449-BCEF-12A396E61B2C}",
                 "Name": "ReferenceImage_HDRLinear",
                 "SourceColor": "Linear",
@@ -31,7 +31,7 @@
                 "PixelFormat": "R9G9B9E5",
                 "DiscardAlpha": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{46D9F30F-793C-4449-BCEF-12A396E61B2C}",
                 "Name": "ReferenceImage_HDRLinear",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_HDRLinearUncompressed.preset

@@ -13,7 +13,7 @@
             "DiscardAlpha": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{EEF24422-C8F0-4ECE-B32A-C70DB8129466}",
                 "Name": "ReferenceImage_HDRLinearUncompressed",
                 "SourceColor": "Linear",
@@ -31,7 +31,7 @@
                 "PixelFormat": "R16G16B16A16F",
                 "DiscardAlpha": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{EEF24422-C8F0-4ECE-B32A-C70DB8129466}",
                 "Name": "ReferenceImage_HDRLinearUncompressed",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/ReferenceImage_Linear.preset

@@ -11,7 +11,7 @@
             "SuppressEngineReduce": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{02C3D9F5-3637-49BA-A48A-D68D629A4D14}",
                 "Name": "ReferenceImage_Linear",
                 "SourceColor": "Linear",
@@ -25,7 +25,7 @@
                 "DestColor": "Linear",
                 "SuppressEngineReduce": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{02C3D9F5-3637-49BA-A48A-D68D629A4D14}",
                 "Name": "ReferenceImage_Linear",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset

@@ -34,7 +34,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
                 "Name": "Reflectance",
                 "SourceColor": "Linear",
@@ -92,7 +92,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{7A3CC95E-0A0C-4CA1-8357-5712B028B77D}",
                 "Name": "Reflectance",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset

@@ -16,7 +16,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
                 "Name": "ReflectanceWithSmoothness_Legacy",
                 "FileMasks": [
@@ -40,7 +40,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{851128B5-7454-42C4-83CE-FCFE071834C5}",
                 "Name": "ReflectanceWithSmoothness_Legacy",
                 "FileMasks": [

Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset

@@ -18,7 +18,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
                 "Name": "Reflectance_Linear",
                 "DestColor": "Linear",
@@ -46,7 +46,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{9B2114F5-118A-4B3A-9CFE-97FA01EC8CFE}",
                 "Name": "Reflectance_Linear",
                 "DestColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Font.preset

@@ -12,7 +12,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
                 "Name": "SF_Font",
                 "SourceColor": "Linear",
@@ -28,7 +28,7 @@
                 "SuppressEngineReduce": true,
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{F34E3711-5F34-4DBC-8F5D-6340D3989F4B}",
                 "Name": "SF_Font",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Gradient.preset

@@ -12,7 +12,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
                 "Name": "SF_Gradient",
                 "SourceColor": "Linear",
@@ -28,7 +28,7 @@
                 "SuppressEngineReduce": true,
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E7F9DF56-DCB0-4683-96EE-F04DA547BE24}",
                 "Name": "SF_Gradient",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset

@@ -13,7 +13,7 @@
             "IsPowerOf2": true
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
                 "Name": "SF_Image",
                 "SourceColor": "Linear",
@@ -31,7 +31,7 @@
                 "PixelFormat": "PVRTC4",
                 "IsPowerOf2": true
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{189A42CB-AEE3-4B80-B276-0FDB0ECA140C}",
                 "Name": "SF_Image",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset

@@ -12,7 +12,7 @@
             "PixelFormat": "BC1"
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
                 "Name": "SF_Image_nonpower2",
                 "SourceColor": "Linear",
@@ -28,7 +28,7 @@
                 "SuppressEngineReduce": true,
                 "PixelFormat": "PVRTC4"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
                 "Name": "SF_Image_nonpower2",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Skybox.preset

@@ -21,7 +21,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
                 "FileMasks": [
@@ -55,7 +55,7 @@
                     "RequiresConvolve": false
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{F359CD3B-37E6-4627-B4F6-2DFC2C0E3C1C}",
                 "Name": "Skybox",
                 "FileMasks": [

Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset

@@ -16,7 +16,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
                 "Name": "Terrain_Albedo",
                 "SourceColor": "Linear",
@@ -40,7 +40,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{88D07159-2FC0-4CBE-82CC-A9DC258C9351}",
                 "Name": "Terrain_Albedo",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset

@@ -15,7 +15,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
                 "Name": "Terrain_Albedo_HighPassed",
                 "SourceColor": "Linear",
@@ -37,7 +37,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{7827AA52-0A7B-43E7-8CD4-55E0BC513AF1}",
                 "Name": "Terrain_Albedo_HighPassed",
                 "SourceColor": "Linear",

Gems/Atom/Asset/ImageProcessingAtom/Config/Uncompressed.preset

@@ -13,7 +13,7 @@
             }
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
                 "Name": "Uncompressed",
                 "PixelFormat": "R8G8B8X8",
@@ -31,7 +31,7 @@
                     "MipGenType": "Box"
                 }
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{E996A696-991C-4FFC-B270-F5AD408B0618}",
                 "Name": "Uncompressed",
                 "PixelFormat": "R8G8B8X8",

Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset

@@ -13,7 +13,7 @@
             "FileMasks": [ "_ui" ]
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",
                 "Name": "UserInterface_Compressed",
                 "SuppressEngineReduce": true,
@@ -25,7 +25,7 @@
                 "SuppressEngineReduce": true,
                 "PixelFormat": "ASTC_6x6"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",
                 "Name": "UserInterface_Compressed",
                 "SuppressEngineReduce": true,

Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Lossless.preset

@@ -13,7 +13,7 @@
             "FileMasks": [ "_ui" ]
         },
         "PlatformsPresets": {
-            "es3": {
+            "android": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,
@@ -25,7 +25,7 @@
                 "SuppressEngineReduce": true,
                 "PixelFormat": "R8G8B8A8"
             },
-            "osx_gl": {
+            "mac": {
                 "UUID": "{83003128-F63E-422B-AEC2-68F0A947225F}",
                 "Name": "UserInterface_Lossless",
                 "SuppressEngineReduce": true,

Gems/Atom/Asset/Shader/Code/Source/Editor/ShaderBuilderUtility.cpp

@@ -736,13 +736,13 @@ namespace AZ
                 {
                     platformId = AzFramework::PlatformId::PC;
                 }
-                else if (platformIdentifier == "osx_gl")
+                else if (platformIdentifier == "mac")
                 {
-                    platformId = AzFramework::PlatformId::OSX;
+                    platformId = AzFramework::PlatformId::MAC;
                 }
-                else if (platformIdentifier == "es3")
+                else if (platformIdentifier == "android")
                 {
-                    platformId = AzFramework::PlatformId::ES3;
+                    platformId = AzFramework::PlatformId::ANDROID_ID;
                 }
                 else if (platformIdentifier == "ios")
                 {
@@ -788,13 +788,13 @@ namespace AZ
                 {
                     platformId = AzFramework::PlatformId::PC;
                 }
-                else if (platform == "osx_gl")
+                else if (platform == "mac")
                 {
-                    platformId = AzFramework::PlatformId::OSX;
+                    platformId = AzFramework::PlatformId::MAC;
                 }
-                else if (platform == "es3")
+                else if (platform == "android")
                 {
-                    platformId = AzFramework::PlatformId::ES3;
+                    platformId = AzFramework::PlatformId::ANDROID_ID;
                 }
                 else if (platform == "ios")
                 {

Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/AreaTex.dds.assetinfo

@@ -17,7 +17,7 @@
 		<Class name="ImageProcessing::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>

Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/SearchTex.dds.assetinfo

@@ -17,7 +17,7 @@
 		<Class name="ImageProcessing::MipGenType" field="MipMapGenType" value="1" type="{8524F650-1417-44DA-BBB0-C707A7A1A709}"/>
 		<Class name="AZStd::map" field="PlatformSpecificOverrides" type="{74E4843B-0924-583D-8C6E-A37B09BD51FE}">
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="es3" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="android" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
@@ -38,7 +38,7 @@
 				</Class>
 			</Class>
 			<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
-				<Class name="AZStd::string" field="value1" value="osx_gl" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+				<Class name="AZStd::string" field="value1" value="mac" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
 				<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
 					<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
 					<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>