Merge branch 'main' into build-strike/SPEC-6281

scripts/build/package/PackageEnv.py

@@ -77,7 +77,7 @@ class PackageEnv(Params):
         def validate_engine_root(engine_root):
             if not os.path.isdir(engine_root):
                 return False
-            return os.path.exists(os.path.join(engine_root, 'engineroot.txt'))
+            return os.path.exists(os.path.join(engine_root, 'engine.json'))
 
         workspace = os.getenv('WORKSPACE')
         if workspace is not None:

scripts/build/package/Platform/Windows/package_filelists/atom.json

@@ -86,7 +86,6 @@
             "ExpressionEvaluation": "#include",
             "FastNoise": "#include",
             "GameEffectSystem": "#include",
-            "GameLift": "#include",
             "GameState": "#include",
             "GameStateSamples": "#include",
             "Gestures": "#include",