SPEC-7799 3P Conversion: ASTCEncoder (#44)

* SPEC-7799 3P Conversion: ASTCEncoder
* Add build script to build astc encoder command line tool and static library from github repo

Signed-off-by: Qing Tao <[email protected]>

package-system/astc-encoder/Findastc-encoder.cmake.template

@@ -0,0 +1,40 @@
+#
+# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution.
+# 
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+#
+
+# this file actually ingests the library and defines targets.
+
+
+set(LIB_NAME "astc-encoder")
+set(TARGET_WITH_NAMESPACE "3rdParty::$${LIB_NAME}")
+
+set($${LIB_NAME}_INCLUDE_DIR $${CMAKE_CURRENT_LIST_DIR}/$${LIB_NAME}/include)
+set($${LIB_NAME}_LIBRARY_DIR $${CMAKE_CURRENT_LIST_DIR}/$${LIB_NAME}/bin)
+
+if ($${PAL_PLATFORM_NAME} STREQUAL "Windows")	
+    set($${LIB_NAME}_LIBRARY_RELEASE $${$${LIB_NAME}_LIBRARY_DIR}/Release/astcenc-sse2-static.lib)
+    set($${LIB_NAME}_LIBRARY_DEBUG $${$${LIB_NAME}_LIBRARY_DIR}/Debug/astcenc-sse2-static.lib
+elseif ($${PAL_PLATFORM_NAME} STREQUAL "Linux")
+    set($${LIB_NAME}_LIBRARY_RELEASE $${$${LIB_NAME}_LIBRARY_DIR}/libastcenc-sse2-static.a)
+    set($${LIB_NAME}_LIBRARY_DEBUG $${$${LIB_NAME}_LIBRARY_RELEASE})
+else()
+    set($${LIB_NAME}_LIBRARY_RELEASE $${$${LIB_NAME}_LIBRARY_DIR}/libastcenc-native-static.a)
+    set($${LIB_NAME}_LIBRARY_DEBUG $${$${LIB_NAME}_LIBRARY_RELEASE})
+endif()
+
+# declare the target so that others can 'depend on it'
+add_library($${TARGET_WITH_NAMESPACE} STATIC IMPORTED GLOBAL)
+
+# add include directory
+ly_target_include_system_directories(TARGET $${TARGET_WITH_NAMESPACE} INTERFACE $${$${LIB_NAME}_INCLUDE_DIR})
+
+# add static library as "output" IMPORTED_LOCATION for the target
+set_target_properties($${TARGET_WITH_NAMESPACE}
+    PROPERTIES
+        IMPORTED_LOCATION_DEBUG $${$${LIB_NAME}_LIBRARY_DEBUG}
+        IMPORTED_LOCATION $${$${LIB_NAME}_LIBRARY_RELEASE}
+)
+
+set($${LIB_NAME}_FOUND True)

package-system/astc-encoder/astc-encoder-3.2-rev1.patch

@@ -0,0 +1,55 @@
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
+index a90fa27..e5ecf8e 100644
+--- a/Source/CMakeLists.txt
++++ b/Source/CMakeLists.txt
+@@ -15,10 +15,11 @@
+ #  under the License.
+ #  ----------------------------------------------------------------------------
+ 
++# O3DE change: use "-flto -ffat-lto-objects" instead of "-flto -fno-fat-lto-objects" for linux since it may remove some functions for static library which leads to undefined symbols
+ # Overwrite the LTO flags to force fat LTO; worth 3-4% performance
+ # See https://gitlab.kitware.com/cmake/cmake/-/issues/16808
+ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang" AND ${CLI})
+-    set(CMAKE_CXX_COMPILE_OPTIONS_IPO "-flto")
++    set(CMAKE_CXX_COMPILE_OPTIONS_IPO "-ffat-lto-objects")
+ endif()
+ 
+ if(${DECOMPRESSOR})
+diff --git a/Source/cmake_core.cmake b/Source/cmake_core.cmake
+index 5ceb521..f6d2426 100644
+--- a/Source/cmake_core.cmake
++++ b/Source/cmake_core.cmake
+@@ -104,6 +104,9 @@ macro(astcenc_set_properties NAME)
+             $<$<CXX_COMPILER_ID:MSVC>:/EHsc>
+             $<$<CXX_COMPILER_ID:MSVC>:/fp:strict>
+ 
++            # O3DE change: remove /GL for MSVC build to resolve linking issue            
++            $<$<CXX_COMPILER_ID:MSVC>:/GL->
++
+             # G++ and Clang++ compiler defines
+             $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall>
+             $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wextra>
+@@ -112,6 +115,9 @@ macro(astcenc_set_properties NAME)
+             $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wshadow>
+             $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wdouble-promotion>
+ 
++            # O3DE change: add PIC to address linking static library issue
++            $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fPIC>
++
+             # Hide noise thrown up by Clang 10 and clang-cl
+             $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-unknown-warning-option>
+             $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wno-c++98-compat-pedantic>
+@@ -141,10 +147,11 @@ macro(astcenc_set_properties NAME)
+             PROPERTY
+                 INTERPROCEDURAL_OPTIMIZATION_RELEASE True)
+ 
+-        # Use a static runtime on MSVC builds (ignored on non-MSVC compilers)
++        # O3DE change: changed from using static runtime to dynamic runtime since O3DE libraries uses dynamic runtime 
++        # Use a dynamic runtime on MSVC builds (ignored on non-MSVC compilers)
+         set_property(TARGET ${NAME}
+             PROPERTY
+-                MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
++                MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+     endif()
+ 
+     # Set up configuration for SIMD ISA builds

package-system/astc-encoder/build_config.json

@@ -0,0 +1,44 @@
+{
+    "git_url": "https://github.com/ARM-software/astc-encoder.git",
+    "git_tag": "3.2",
+    "package_name": "astc-encoder",
+    "package_version": "3.2-rev1",
+    "package_url": "https://github.com/ARM-software/astc-encoder",
+    "package_license": "Apache-2.0",
+    "package_license_file": "LICENSE.txt",
+    "cmake_find_template": "Findastc-encoder.cmake.template",
+    "cmake_find_target": "Findastc-encoder.cmake",
+    "patch_file": "astc-encoder-3.2-rev1.patch",
+    "Platforms": {
+        "Windows": {
+            "Windows": {
+                "custom_build_cmd": [
+                    "build_windows.cmd"
+                ],
+                "custom_install_cmd": [
+                    "install_windows.cmd"
+                ]
+            }
+        },
+        "Darwin": {
+            "Mac": {
+                "custom_build_cmd": [
+                    "./build_mac.sh"
+                ],
+                "custom_install_cmd": [
+                    "./install_mac.sh"
+                ]
+            }
+        },
+        "Linux": {
+            "Linux": {
+                "custom_build_cmd": [
+                    "./build_linux.sh"
+                ],
+                "custom_install_cmd": [
+                    "./install_linux.sh"
+                ]
+            }
+        }
+    }
+}

package-system/astc-encoder/build_linux.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+
+cmake -S temp/src -B temp/build -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DISA_SSE2=ON
+
+if [ $? -ne 0 ]; then
+    echo "Error generating build"
+    exit 1
+fi
+
+cmake --build temp/build -j 8
+if [ $? -ne 0 ]; then
+    echo "Error building"
+    exit 1
+fi

package-system/astc-encoder/build_mac.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+
+export CXX=clang++
+
+# using -DISA_AVX2=ON enables build for x86_64
+# using -DISA_NEON=ON enables build for arm64 
+# to build arm64 requires xcode 12.3 and macos 11 which is not supported on my Mac
+# we have to disable cpu specific options for an universal build
+
+cmake -S temp/src -B temp/build -G "Unix Makefiles" 
+
+if [ $? -ne 0 ]; then
+    echo "Error generating build"
+    exit 1
+fi
+
+cmake --build temp/build --config Release -j 8
+if [ $? -ne 0 ]; then
+    echo "Error building"
+    exit 1
+fi
+

package-system/astc-encoder/build_windows.cmd

@@ -0,0 +1,17 @@
+REM
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM 
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
+
+cmake -S temp/src -B temp/build -G "Visual Studio 16 2019" -DISA_SSE2=ON
+
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+cmake --build temp/build --config Release -j 8
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+cmake --build temp/build --config Debug -j 8
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+
+exit /b 0

package-system/astc-encoder/install_linux.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+
+BIN_PATH=$TARGET_INSTALL_ROOT/bin
+INCLUDE_PATH=$TARGET_INSTALL_ROOT/include
+
+mkdir -p $INCLUDE_PATH
+mkdir -p $BIN_PATH
+
+# copy LICENSE.txt and header file
+cp -f temp/src/LICENSE.txt $TARGET_INSTALL_ROOT/ || exit $?
+cp -f temp/src/Source/astcenc.h $INCLUDE_PATH/ || exit $?
+
+BUILD_PATH=temp/build/Source
+
+# copy static lib and executable
+cp -f $BUILD_PATH/astcenc-sse2 $BIN_PATH/ || exit $?
+cp -f $BUILD_PATH/libastcenc-sse2-static.a $BIN_PATH/ || exit $?
+
+exit 0

package-system/astc-encoder/install_mac.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Copyright (c) Contributors to the Open 3D Engine Project.
+# For complete copyright and license terms please see the LICENSE at the root of this distribution.
+#
+# SPDX-License-Identifier: Apache-2.0 OR MIT
+
+BIN_PATH=$TARGET_INSTALL_ROOT/bin
+INCLUDE_PATH=$TARGET_INSTALL_ROOT/include
+
+mkdir -p $INCLUDE_PATH
+mkdir -p $BIN_PATH
+
+# copy LICENSE.txt and header file
+cp -f temp/src/LICENSE.txt $TARGET_INSTALL_ROOT/ || exit $?
+cp -f temp/src/Source/astcenc.h $INCLUDE_PATH/ || exit $?
+
+BUILD_PATH=temp/build/Source
+
+# copy static lib and executable
+cp -f $BUILD_PATH/astcenc-native $BIN_PATH/ || exit $?
+cp -f $BUILD_PATH/libastcenc-native-static.a $BIN_PATH/ || exit $?
+
+exit 0

package-system/astc-encoder/install_windows.cmd

@@ -0,0 +1,42 @@
+@echo off
+
+REM
+REM Copyright (c) Contributors to the Open 3D Engine Project.
+REM For complete copyright and license terms please see the LICENSE at the root of this distribution.
+REM 
+REM SPDX-License-Identifier: Apache-2.0 OR MIT
+REM
+REM
+
+REM Note: both the executable and static library are packed in the package. Only the static library is used in O3DE. 
+REM       The executable is for debugging purpose and it's not required to build O3DE gems or projects.
+
+SET BIN_PATH=%TARGET_INSTALL_ROOT%\bin
+SET INCLUDE_PATH=%TARGET_INSTALL_ROOT%\include
+
+mkdir %INCLUDE_PATH%
+mkdir %BIN_PATH%
+mkdir %BIN_PATH%\Release
+mkdir %BIN_PATH%\Debug
+
+copy /Y temp\src\LICENSE.TXT %TARGET_INSTALL_ROOT%\
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+
+copy /Y temp\src\Source\astcenc.h %INCLUDE_PATH%
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+
+SET BUILD_PATH=temp\build\Source
+
+copy /Y %BUILD_PATH%\Release\*.exe %BIN_PATH%\Release\
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+
+copy /Y %BUILD_PATH%\Release\*.lib %BIN_PATH%\Release\
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+
+copy /Y %BUILD_PATH%\Debug\*.exe %BIN_PATH%\Debug\
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+
+copy /Y %BUILD_PATH%\Debug\*.lib %BIN_PATH%\Debug\
+@if %errorlevel% NEQ 0 ( exit /b 1 )
+
+exit /b 0

package_build_list_host_darwin.json

@@ -10,8 +10,8 @@
         "Lua-5.3.5-rev5-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name iOS --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Mac --package-root ../../package-system --clean",
         "etc2comp-9cd0f9cae0-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/etc2comp --platform-name Mac --package-root ../../package-system --clean",
-        "freetype-2.10.4.16-mac" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Mac --package-root ../../package-system --clean",
-        "freetype-2.10.4.16-ios" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name iOS --package-root ../../package-system --clean",
+        "freetype-2.10.4.16-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Mac --package-root ../../package-system --clean",
+        "freetype-2.10.4.16-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name iOS --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name iOS --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Mac --package-root ../../package-system --clean",
         "googletest-1.8.1-rev4-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name iOS --package-root ../../package-system --clean",
@@ -31,10 +31,11 @@
         "poly2tri-7f0487a-rev1-mac": "package-system/poly2tri/build_package_image.py --platform-name mac",
         "v-hacd-2.3-1a49edf-rev1-mac": "package-system/v-hacd/build_package_image.py --platform-name mac",
         "SPIRVCross-2021.04.29-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Mac --package-root ../../package-system --clean",
-        "squish-ccr-deb557d-rev1-mac" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac --package-root ../../package-system --clean",
+        "squish-ccr-deb557d-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Mac --package-root ../../package-system --clean",
+        "astc-encoder-3.2-rev1-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Mac --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Mac --package-root ../../package-system --clean",
         "azslc-1.7.23-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Mac --package-root ../../package-system --clean",
-        "python-3.7.10-rev1-darwin" : "package-system/python/build_package_image.py",
+        "python-3.7.10-rev1-darwin": "package-system/python/build_package_image.py",
         "mcpp-2.7.2_az.1-rev1-mac": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.1-rev1",
         "mikkelsen-1.0.0.4-mac": "package-system/mikkelsen/build_package_image.py --platform mac",
         "mikkelsen-1.0.0.4-ios": "package-system/mikkelsen/build_package_image.py --platform ios",
@@ -42,8 +43,8 @@
         "zlib-1.2.11-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name iOS --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-mac": "package-system/lz4/build_package_image.py --platform-name mac",
         "lz4-1.9.3-vcpkg-rev4-ios": "package-system/lz4/build_package_image.py --platform-name ios",
-        "tiff-4.2.0.15-rev2-mac" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Mac --package-root ../../package-system --clean",
-        "tiff-4.2.0.15-rev2-ios" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name iOS --package-root ../../package-system --clean"
+        "tiff-4.2.0.15-rev2-mac": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Mac --package-root ../../package-system --clean",
+        "tiff-4.2.0.15-rev2-ios": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name iOS --package-root ../../package-system --clean"
     },
     "build_from_folder": {
         "AWSNativeSDK-1.7.167-rev5-mac": "package-system/AWSNativeSDK-mac",
@@ -52,8 +53,8 @@
         "Lua-5.3.5-rev5-ios": "package-system/Lua-ios",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-mac": "package-system/AwsIotDeviceSdkCpp-mac",
         "etc2comp-9cd0f9cae0-rev1-mac": "package-system/etc2comp-mac",
-        "freetype-2.10.4.16-mac" : "package-system/freetype-mac",
-        "freetype-2.10.4.16-ios" : "package-system/freetype-ios",
+        "freetype-2.10.4.16-mac": "package-system/freetype-mac",
+        "freetype-2.10.4.16-ios": "package-system/freetype-ios",
         "googlebenchmark-1.5.0-rev2-ios": "package-system/googlebenchmark-ios",
         "googlebenchmark-1.5.0-rev2-mac": "package-system/googlebenchmark-mac",
         "googletest-1.8.1-rev4-ios": "package-system/googletest-ios",
@@ -68,9 +69,8 @@
         "ilmbase-2.3.0-rev4-mac": "package-system/ilmbase-mac",
         "tiff-4.2.0.15-rev2-mac": "package-system/tiff-mac",
         "tiff-4.2.0.15-rev2-ios": "package-system/tiff-ios",
-        "python-3.7.10-rev1-darwin" : "package-system/python/darwin_x64/package",
-        "asn1-0.9.27-rev2-ios" : "package-system/asn1-ios",
-        "ASTCEncoder-2017_11_14-rev2-multiplatform" : "package-system/ASTCEncoder-multiplatform",
+        "python-3.7.10-rev1-darwin": "package-system/python/darwin_x64/package",
+        "asn1-0.9.27-rev2-ios": "package-system/asn1-ios",
         "PhysX-4.1.2.29882248-rev3-mac": "package-system/PhysX-mac",
         "PhysX-4.1.2.29882248-rev3-ios": "package-system/PhysX-ios",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-mac": "package-system/NvCloth-mac",
@@ -82,6 +82,7 @@
         "mcpp-2.7.2_az.1-rev1-mac": "package-system/mcpp-mac",
         "SPIRVCross-2021.04.29-rev1-mac": "package-system/SPIRVCross-mac",
         "squish-ccr-deb557d-rev1-mac": "package-system/squish-ccr-mac",
+        "astc-encoder-3.2-rev1-mac": "package-system/astc-encoder-mac",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-mac": "package-system/DirectXShaderCompilerDxc-mac",
         "azslc-1.7.23-rev2-mac": "package-system/azslc-mac",
         "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",

package_build_list_host_linux.json

@@ -8,7 +8,7 @@
         "Lua-5.3.5-rev5-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Linux --package-root ../../package-system --clean",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --platform-name Linux --package-root ../../package-system --clean",
         "etc2comp-9cd0f9cae0-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/etc2comp --platform-name Linux --package-root ../../package-system --clean",
-        "freetype-2.10.4.16-linux" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux --package-root ../../package-system --clean",
+        "freetype-2.10.4.16-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Linux --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Linux --package-root ../../package-system --clean",
         "googletest-1.8.1-rev4-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Linux --package-root ../../package-system --clean",
         "ISPCTexComp-36b80aa-rev1-linux": "package-system/ISPCTexComp/build_package_image.py",
@@ -22,7 +22,8 @@
         "poly2tri-7f0487a-rev1-linux": "package-system/poly2tri/build_package_image.py --platform-name linux",
         "v-hacd-2.3-1a49edf-rev1-linux": "package-system/v-hacd/build_package_image.py --platform-name linux",
         "SPIRVCross-2021.04.29-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Linux --package-root ../../package-system --clean",
-        "squish-ccr-deb557d-rev1-linux" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --package-root ../../package-system --clean",
+        "squish-ccr-deb557d-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Linux --package-root ../../package-system --clean",
+        "astc-encoder-3.2-rev1-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Linux --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Linux --package-root ../../package-system --clean",
         "azslc-1.7.23-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Linux --package-root ../../package-system --clean",
         "tiff-4.2.0.15-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Linux --package-root ../../package-system --clean",
@@ -31,13 +32,13 @@
         "zlib-1.2.11-rev2-linux": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Linux --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-linux": "package-system/lz4/build_package_image.py --platform-name linux"
     },
-    "build_from_folder" : {
+    "build_from_folder": {
         "AWSGameLiftServerSDK-3.4.1-rev1-linux": "package-system/AWSGameLiftServerSDK/linux",
         "AWSNativeSDK-1.7.167-rev6-linux": "package-system/AWSNativeSDK-linux",
         "Lua-5.3.5-rev5-linux": "package-system/Lua-linux",
         "AwsIotDeviceSdkCpp-1.12.2-rev1-linux": "package-system/AwsIotDeviceSdkCpp-linux",
         "etc2comp-9cd0f9cae0-rev1-linux": "package-system/etc2comp-linux",
-        "freetype-2.10.4.16-linux" : "package-system/freetype-linux",
+        "freetype-2.10.4.16-linux": "package-system/freetype-linux",
         "googlebenchmark-1.5.0-rev2-linux": "package-system/googlebenchmark-linux",
         "googletest-1.8.1-rev4-linux": "package-system/googletest-linux",
         "ISPCTexComp-36b80aa-rev1-linux": "package-system/ISPCTexComp-linux",
@@ -47,7 +48,8 @@
         "OpenSSL-1.1.1b-rev2-linux": "package-system/OpenSSL-linux",
         "ilmbase-2.3.0-rev4-linux": "package-system/ilmbase-linux",
         "SPIRVCross-2021.04.29-rev1-linux": "package-system/SPIRVCross-linux",
-        "squish-ccr-deb557d-rev1-linux" : "package-system/squish-ccr-linux",
+        "squish-ccr-deb557d-rev1-linux": "package-system/squish-ccr-linux",
+        "astc-encoder-3.2-rev1-linux": "package-system/astc-encoder-linux",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-linux": "package-system/DirectXShaderCompilerDxc-linux",
         "azslc-1.7.23-rev2-linux": "package-system/azslc-linux",
         "tiff-4.2.0.15-rev2-linux": "package-system/tiff-linux",

package_build_list_host_windows.json

@@ -3,18 +3,18 @@
     "comment2" : "build_from_source is package name --> build script to call with params",
     "comment3" : "build_from_folder is package name --> folder containing built image of package",
     "comment4" : "Note:  Build from source occurs before build_from_folder",
-    "build_from_source" : {
-        "AWSNativeSDK-1.7.167-rev4-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
-        "AWSNativeSDK-1.7.167-rev6-android" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
+    "build_from_source": {
+        "AWSNativeSDK-1.7.167-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Windows --package-root ../../package-system --clean",
+        "AWSNativeSDK-1.7.167-rev6-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AWSNativeSDK --platform-name Android --package-root ../../package-system --clean",
         "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast/build_package_image.py --platform-name windows",
-        "Crashpad-0.8.0-rev1-windows" : "package-system/Crashpad/build_package_image.py",
-        "Lua-5.3.5-rev5-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Windows --package-root ../../package-system --clean",
-        "Lua-5.3.5-rev5-android" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Android --package-root ../../package-system --clean",
-        "AwsIotDeviceSdkCpp-1.12.2-rev1-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean",
-        "AwsIotDeviceSdkCpp-1.12.2-rev1-android" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Android --package-root ../../package-system --clean",
-        "etc2comp-9cd0f9cae0-rev1-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/etc2comp --platform-name Windows --package-root ../../package-system --clean",
-        "freetype-2.10.4.16-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Windows --package-root ../../package-system --clean",
-        "freetype-2.10.4.16-android" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Android --package-root ../../package-system --clean",
+        "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad/build_package_image.py",
+        "Lua-5.3.5-rev5-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Windows --package-root ../../package-system --clean",
+        "Lua-5.3.5-rev5-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/Lua --platform-name Android --package-root ../../package-system --clean",
+        "AwsIotDeviceSdkCpp-1.12.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Windows --package-root ../../package-system --clean",
+        "AwsIotDeviceSdkCpp-1.12.2-rev1-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/AwsIotDeviceSdkCpp --build-path c:/Temp/awsiot --platform-name Android --package-root ../../package-system --clean",
+        "etc2comp-9cd0f9cae0-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/etc2comp --platform-name Windows --package-root ../../package-system --clean",
+        "freetype-2.10.4.16-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Windows --package-root ../../package-system --clean",
+        "freetype-2.10.4.16-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/freetype --platform-name Android --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Windows --package-root ../../package-system --clean",
         "googlebenchmark-1.5.0-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googlebenchmark --platform-name Android --package-root ../../package-system --clean",
         "googletest-1.8.1-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/googletest --platform-name Windows --package-root ../../package-system --clean",
@@ -29,91 +29,93 @@
         "OpenSSL-1.1.1b-rev1-android": "package-system/OpenSSL/build_package_image.py --platform-name android",
         "ilmbase-2.3.0-rev4-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Windows --package-root ../../package-system --clean",
         "SPIRVCross-2021.04.29-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/SPIRVCross --platform-name Windows --package-root ../../package-system --clean",
-        "squish-ccr-deb557d-rev1-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Windows --package-root ../../package-system --clean",
+        "squish-ccr-deb557d-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/squish-ccr --platform-name Windows --package-root ../../package-system --clean",
+        "astc-encoder-3.2-rev1-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/astc-encoder --platform-name Windows --package-root ../../package-system --clean",
         "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/DirectXShaderCompiler --platform-name Windows --package-root ../../package-system --clean",
         "azslc-1.7.23-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/azslc --platform-name Windows --package-root ../../package-system --clean",
-        "PhysX-4.1.2.29882248-rev3-windows" : "package-system/PhysX/build_package_image.py --platform windows",
-        "PhysX-4.1.2.29882248-rev3-android" : "package-system/PhysX/build_package_image.py --platform android",
+        "PhysX-4.1.2.29882248-rev3-windows": "package-system/PhysX/build_package_image.py --platform windows",
+        "PhysX-4.1.2.29882248-rev3-android": "package-system/PhysX/build_package_image.py --platform android",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth/build_package_image.py --platform-name windows",
         "NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth/build_package_image.py --platform-name android",
         "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri/build_package_image.py --platform-name windows",
         "RapidJSON-1.1.0-rev1-multiplatform": "Scripts/extras/pull_and_build_from_git.py ../../package-system/RapidJSON --platform-name multiplatform --package-root ../../package-system",
         "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd/build_package_image.py --platform-name windows",
-        "python-3.7.10-rev2-windows" : "package-system/python/build_package_image.py",
+        "python-3.7.10-rev2-windows": "package-system/python/build_package_image.py",
         "mikkelsen-1.0.0.4-windows": "package-system/mikkelsen/build_package_image.py",
         "mikkelsen-1.0.0.4-android": "package-system/mikkelsen/build_package_image.py --platform android",
         "zlib-1.2.11-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Windows --package-root ../../package-system --clean",
         "zlib-1.2.11-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/zlib --platform-name Android --package-root ../../package-system --clean",
         "lz4-1.9.3-vcpkg-rev4-windows": "package-system/lz4/build_package_image.py --platform-name windows",
         "lz4-1.9.3-vcpkg-rev4-android": "package-system/lz4/build_package_image.py --platform-name android",
-        "tiff-4.2.0.15-rev2-windows" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Windows --package-root ../../package-system --clean",
-        "tiff-4.2.0.15-rev2-android" : "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Android --package-root ../../package-system --clean"
-      },
-  "build_from_folder": {
-    "AWSGameLiftServerSDK-3.4.1-rev1-windows" : "package-system/AWSGameLiftServerSDK/windows",
-    "AWSNativeSDK-1.7.167-rev4-windows": "package-system/AWSNativeSDK-windows",
-    "AWSNativeSDK-1.7.167-rev6-android": "package-system/AWSNativeSDK-android",
-    "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast-windows",
-    "Crashpad-0.8.0-rev1-windows" : "package-system/Crashpad-windows",
-    "Lua-5.3.5-rev5-windows": "package-system/Lua-windows",
-    "Lua-5.3.5-rev5-android": "package-system/Lua-android",
-    "AwsIotDeviceSdkCpp-1.12.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
-    "AwsIotDeviceSdkCpp-1.12.2-rev1-android": "package-system/AwsIotDeviceSdkCpp-android",
-    "etc2comp-9cd0f9cae0-rev1-windows": "package-system/etc2comp-windows",
-    "freetype-2.10.4.16-windows": "package-system/freetype-windows",
-    "freetype-2.10.4.16-android": "package-system/freetype-android",
-    "googlebenchmark-1.5.0-rev2-windows": "package-system/googlebenchmark-windows",
-    "googlebenchmark-1.5.0-rev2-android": "package-system/googlebenchmark-android",
-    "googletest-1.8.1-rev4-windows": "package-system/googletest-windows",
-    "googletest-1.8.1-rev4-android": "package-system/googletest-android",
-    "libpng-1.6.37-rev1-windows": "package-system/libpng-windows",
-    "libpng-1.6.37-rev1-android": "package-system/libpng-android",
-    "libsamplerate-0.2.1-rev2-windows": "package-system/libsamplerate-windows",
-    "libsamplerate-0.2.1-rev2-android": "package-system/libsamplerate-android",
-    "OpenSSL-1.1.1b-rev2-windows": "package-system/OpenSSL-windows",
-    "OpenSSL-1.1.1b-rev1-android": "package-system/OpenSSL-android",
-    "tiff-4.2.0.15-rev2-android": "package-system/tiff-android",
-    "tiff-4.2.0.15-rev2-windows": "package-system/tiff-windows",
-    "lux_core-2.2-rev5-multiplatform": "package-system/luxcore-multiplatform",
-    "python-3.7.10-rev2-windows": "package-system/python/win_x64/package",
-    "pybind11-2.4.3-rev1-multiplatform": "package-system/pybind11-multiplatform",
-    "alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
-    "ilmbase-2.3.0-rev4-windows": "package-system/ilmbase-windows",
-    "assimp-5.0.1-rev11-multiplatform": "package-system/assimp-multiplatform",
-    "md5-2.0-multiplatform": "package-system/md5-multiplatform",
-    "RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform",
-    "RapidXML-1.13-rev1-multiplatform": "package-system/RapidXML-multiplatform",
-    "PhysX-4.1.2.29882248-rev3-windows" : "package-system/PhysX-windows",
-    "PhysX-4.1.2.29882248-rev3-android" : "package-system/PhysX-android",
-    "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth-windows",
-    "NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth-android",
-    "mikkelsen-1.0.0.4-windows": "package-system/mikkelsen-windows",
-    "mikkelsen-1.0.0.4-android": "package-system/mikkelsen-android",
-    "OpenMesh-8.1-rsv1-windows": "package-system/OpenMesh-windows",
-    "pyside2-qt-5.15.1-rev2-windows": "package-system/pyside2-windows",
-    "d3dx12-headers-rev1-windows": "package-system/d3dx12-windows",
-    "mcpp-2.7.2_az.1-rev1-windows": "package-system/mcpp-windows",
-    "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform",
-    "civetweb-1.8-rev1-windows": "package-system/civetweb-windows",
-    "expat-2.1.0-multiplatform": "package-system/expat-multiplatform",
-    "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri-windows",
-    "openimageio-2.1.16.0-rev2-windows": "package-system/openimageio-windows",
-    "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd-windows",
-    "SPIRVCross-2021.04.29-rev1-windows": "package-system/SPIRVCross-windows",
-    "squish-ccr-deb557d-rev1-windows" : "package-system/squish-ccr-windows",
-    "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "package-system/DirectXShaderCompilerDxc-windows",
-    "azslc-1.7.23-rev2-windows": "package-system/azslc-windows",
-    "zstd-1.35-multiplatform": "package-system/zstd-multiplatform",
-    "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
-    "glad-2.0.0-beta-rev2-multiplatform": "package-system/glad-multiplatform",
-    "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
-    "PVRTexTool-4.24.0-rev4-multiplatform": "package-system/PVRTexTool-multiplatform",
-    "ISPCTexComp-36b80aa-rev1-windows": "package-system/ISPCTexComp-windows",
-    "qt-5.15.2-rev4-windows": "package-system/qt-windows",
-    "Wwise-2021.1.0.7575-rev1-multiplatform": "package-system/Wwise-multiplatform",
-    "zlib-1.2.11-rev2-android": "package-system/zlib-android",
-    "zlib-1.2.11-rev2-windows": "package-system/zlib-windows",
-    "lz4-1.9.3-vcpkg-rev4-windows": "package-system/lz4-windows",
-    "lz4-1.9.3-vcpkg-rev4-android": "package-system/lz4-android"
-  }
+        "tiff-4.2.0.15-rev2-windows": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Windows --package-root ../../package-system --clean",
+        "tiff-4.2.0.15-rev2-android": "Scripts/extras/pull_and_build_from_git.py ../../package-system/tiff --platform-name Android --package-root ../../package-system --clean"
+    },
+    "build_from_folder": {
+        "AWSGameLiftServerSDK-3.4.1-rev1-windows": "package-system/AWSGameLiftServerSDK/windows",
+        "AWSNativeSDK-1.7.167-rev4-windows": "package-system/AWSNativeSDK-windows",
+        "AWSNativeSDK-1.7.167-rev6-android": "package-system/AWSNativeSDK-android",
+        "Blast-v1.1.7_rc2-9-geb169fe-rev2-windows": "package-system/Blast-windows",
+        "Crashpad-0.8.0-rev1-windows": "package-system/Crashpad-windows",
+        "Lua-5.3.5-rev5-windows": "package-system/Lua-windows",
+        "Lua-5.3.5-rev5-android": "package-system/Lua-android",
+        "AwsIotDeviceSdkCpp-1.12.2-rev1-windows": "package-system/AwsIotDeviceSdkCpp-windows",
+        "AwsIotDeviceSdkCpp-1.12.2-rev1-android": "package-system/AwsIotDeviceSdkCpp-android",
+        "etc2comp-9cd0f9cae0-rev1-windows": "package-system/etc2comp-windows",
+        "freetype-2.10.4.16-windows": "package-system/freetype-windows",
+        "freetype-2.10.4.16-android": "package-system/freetype-android",
+        "googlebenchmark-1.5.0-rev2-windows": "package-system/googlebenchmark-windows",
+        "googlebenchmark-1.5.0-rev2-android": "package-system/googlebenchmark-android",
+        "googletest-1.8.1-rev4-windows": "package-system/googletest-windows",
+        "googletest-1.8.1-rev4-android": "package-system/googletest-android",
+        "libpng-1.6.37-rev1-windows": "package-system/libpng-windows",
+        "libpng-1.6.37-rev1-android": "package-system/libpng-android",
+        "libsamplerate-0.2.1-rev2-windows": "package-system/libsamplerate-windows",
+        "libsamplerate-0.2.1-rev2-android": "package-system/libsamplerate-android",
+        "OpenSSL-1.1.1b-rev2-windows": "package-system/OpenSSL-windows",
+        "OpenSSL-1.1.1b-rev1-android": "package-system/OpenSSL-android",
+        "tiff-4.2.0.15-rev2-android": "package-system/tiff-android",
+        "tiff-4.2.0.15-rev2-windows": "package-system/tiff-windows",
+        "lux_core-2.2-rev5-multiplatform": "package-system/luxcore-multiplatform",
+        "python-3.7.10-rev2-windows": "package-system/python/win_x64/package",
+        "pybind11-2.4.3-rev1-multiplatform": "package-system/pybind11-multiplatform",
+        "alembic-1.7.11-rev3-multiplatform": "package-system/alembic-multiplatform",
+        "ilmbase-2.3.0-rev4-windows": "package-system/ilmbase-windows",
+        "assimp-5.0.1-rev11-multiplatform": "package-system/assimp-multiplatform",
+        "md5-2.0-multiplatform": "package-system/md5-multiplatform",
+        "RapidJSON-1.1.0-rev1-multiplatform": "package-system/RapidJSON-multiplatform",
+        "RapidXML-1.13-rev1-multiplatform": "package-system/RapidXML-multiplatform",
+        "PhysX-4.1.2.29882248-rev3-windows": "package-system/PhysX-windows",
+        "PhysX-4.1.2.29882248-rev3-android": "package-system/PhysX-android",
+        "NvCloth-v1.1.6-4-gd243404-pr58-rev1-windows": "package-system/NvCloth-windows",
+        "NvCloth-v1.1.6-4-gd243404-pr58-rev1-android": "package-system/NvCloth-android",
+        "mikkelsen-1.0.0.4-windows": "package-system/mikkelsen-windows",
+        "mikkelsen-1.0.0.4-android": "package-system/mikkelsen-android",
+        "OpenMesh-8.1-rsv1-windows": "package-system/OpenMesh-windows",
+        "pyside2-qt-5.15.1-rev2-windows": "package-system/pyside2-windows",
+        "d3dx12-headers-rev1-windows": "package-system/d3dx12-windows",
+        "mcpp-2.7.2_az.1-rev1-windows": "package-system/mcpp-windows",
+        "cityhash-1.1-multiplatform": "package-system/cityhash-multiplatform",
+        "civetweb-1.8-rev1-windows": "package-system/civetweb-windows",
+        "expat-2.1.0-multiplatform": "package-system/expat-multiplatform",
+        "poly2tri-7f0487a-rev1-windows": "package-system/poly2tri-windows",
+        "openimageio-2.1.16.0-rev2-windows": "package-system/openimageio-windows",
+        "v-hacd-2.3-1a49edf-rev1-windows": "package-system/v-hacd-windows",
+        "SPIRVCross-2021.04.29-rev1-windows": "package-system/SPIRVCross-windows",
+        "squish-ccr-deb557d-rev1-windows": "package-system/squish-ccr-windows",
+        "astc-encoder-3.2-rev1-windows": "package-system/astc-encoder-windows",
+        "DirectXShaderCompilerDxc-1.6.2104-o3de-rev3-windows": "package-system/DirectXShaderCompilerDxc-windows",
+        "azslc-1.7.23-rev2-windows": "package-system/azslc-windows",
+        "zstd-1.35-multiplatform": "package-system/zstd-multiplatform",
+        "SQLite-3.32.2-rev3-multiplatform": "package-system/SQLite-multiplatform",
+        "glad-2.0.0-beta-rev2-multiplatform": "package-system/glad-multiplatform",
+        "xxhash-0.7.4-rev1-multiplatform": "package-system/xxhash-multiplatform",
+        "PVRTexTool-4.24.0-rev4-multiplatform": "package-system/PVRTexTool-multiplatform",
+        "ISPCTexComp-36b80aa-rev1-windows": "package-system/ISPCTexComp-windows",
+        "qt-5.15.2-rev4-windows": "package-system/qt-windows",
+        "Wwise-2021.1.0.7575-rev1-multiplatform": "package-system/Wwise-multiplatform",
+        "zlib-1.2.11-rev2-android": "package-system/zlib-android",
+        "zlib-1.2.11-rev2-windows": "package-system/zlib-windows",
+        "lz4-1.9.3-vcpkg-rev4-windows": "package-system/lz4-windows",
+        "lz4-1.9.3-vcpkg-rev4-android": "package-system/lz4-android"
+    }
 }