Update PS4 configuration to use sabi.json manifests

This change updates the PS4 configuration to use sabi.json manifests. b/143107780 b/29358852 Change-Id: I989692cd8ff4583ea6b87afe0de7c9922de09226
mingchou · Nov 6, 2019 · 1810852 · 1810852
1 parent 637fe04
commit 1810852
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/glimp/glimp.gyp b/glimp/glimp.gyp
@@ -20,7 +20,7 @@
 
       'dependencies': [
         # Forward-depend on the platform-specific glimp implementation.
-        '<(DEPTH)/glimp/<(target_arch)/glimp_platform.gyp:glimp_platform',
+        '<(DEPTH)/glimp/<(sb_target_platform)/glimp_platform.gyp:glimp_platform',
       ],
 
       'direct_dependent_settings': {

diff --git a/glimp/glimp_settings.gypi b/glimp/glimp_settings.gypi
@@ -24,8 +24,8 @@
     # the preprocessor to assemble an include file path, so we have to do
     # the concatenation here in GYP.
     # http://stackoverflow.com/questions/29601786/c-preprocessor-building-a-path-string
-    'GLIMP_EGLPLATFORM_INCLUDE="../../<(target_arch)/eglplatform_public.h"',
-    'GLIMP_KHRPLATFORM_INCLUDE="../../<(target_arch)/khrplatform_public.h"',
+    'GLIMP_EGLPLATFORM_INCLUDE="../../<(sb_target_platform)/eglplatform_public.h"',
+    'GLIMP_KHRPLATFORM_INCLUDE="../../<(sb_target_platform)/khrplatform_public.h"',
     # Uncomment the define below to enable and use tracing inside glimp.
     # 'ENABLE_GLIMP_TRACING',
 ],

diff --git a/nb/nb.gyp b/nb/nb.gyp
@@ -74,7 +74,7 @@
             '<(DEPTH)/starboard/starboard_headers_only.gyp:starboard_headers_only',
           ],
         }],
-        ['target_arch == "ps4"', {
+        ['sb_target_platform == "ps4"', {
           'sources': [
             'kernel_contiguous_allocator_ps4.cc',
             'kernel_contiguous_allocator_ps4.h',

diff --git a/testing/gtest.gyp b/testing/gtest.gyp
@@ -179,7 +179,7 @@
                   '_POSIX_PATH_MAX=255',
                 ],
               }],
-              ['target_arch=="ps4"', {
+              ['sb_target_platform=="ps4"', {
                 'gtest_defines!' : [
                   'GTEST_USE_OWN_TR1_TUPLE=1',
                 ],

diff --git a/third_party/mozjs-45/mozjs-45.gyp b/third_party/mozjs-45/mozjs-45.gyp
@@ -110,15 +110,6 @@
         ],
       }],
 
-      # TODO: Remove once ps4 configuration todos are addressed.
-      ['target_arch == "ps4" or sb_target_platform == "ps4"', {
-        'common_defines': [
-          'JS_CPU_X64=1',
-          'JS_CODEGEN_X64=1',
-          'JS_PUNBOX64=1',
-        ],
-      }],
-
       ['cobalt_config != "gold"', {
         'common_defines': [
           'JS_TRACE_LOGGING=1',
@@ -227,8 +218,7 @@
             'js/src/jit/x86/Trampoline-x86.cpp',
           ],
         }],
-        # TODO: Remove "* == ps4" once ps4 configuration todos are addressed.
-        ['target_arch == "x64" or target_arch == "ps4" or sb_target_platform == "ps4"', {
+        ['target_arch == "x64"', {
           'sources': [
             'js/src/jit/x64/Assembler-x64.cpp',
             'js/src/jit/x64/Bailouts-x64.cpp',