Import Cobalt 21.master.0.267507
Includes the following patches:
https://cobalt-review.googlesource.com/c/cobalt/+/5630
by devin.cai@mediatek.com
https://cobalt-review.googlesource.com/c/cobalt/+/5710
by p.mirgos@samsung.com
https://cobalt-review.googlesource.com/c/cobalt/+/5730
by lizhi.fan@samsung.com
diff --git a/src/starboard/evergreen/arm/hardfp/configuration_public.h b/src/starboard/evergreen/arm/hardfp/configuration_public.h
index b813c19..cdeafc9 100644
--- a/src/starboard/evergreen/arm/hardfp/configuration_public.h
+++ b/src/starboard/evergreen/arm/hardfp/configuration_public.h
@@ -163,7 +163,7 @@
// Whether this platform has and should use an MMAP function to map physical
// memory to the virtual address space.
-#if SB_API_VERSION < SB_MMAP_REQUIRED_VERSION
+#if SB_API_VERSION < 12
#define SB_HAS_MMAP 1
#endif
diff --git a/src/starboard/evergreen/arm/hardfp/gyp_configuration.py b/src/starboard/evergreen/arm/hardfp/gyp_configuration.py
index 467ce05..db3e2cb 100644
--- a/src/starboard/evergreen/arm/hardfp/gyp_configuration.py
+++ b/src/starboard/evergreen/arm/hardfp/gyp_configuration.py
@@ -22,4 +22,4 @@
def CreatePlatformConfig():
return parent_configuration.EvergreenArmConfiguration(
'evergreen-arm-hardfp',
- sabi_json_path='starboard/sabi/arm/hardfp/sabi.json')
+ sabi_json_path='starboard/sabi/arm/hardfp/sabi-v{sb_api_version}.json')
diff --git a/src/starboard/evergreen/arm/hardfp/sbversion/12/atomic_public.h b/src/starboard/evergreen/arm/hardfp/sbversion/12/atomic_public.h
new file mode 100644
index 0000000..7f66416
--- /dev/null
+++ b/src/starboard/evergreen/arm/hardfp/sbversion/12/atomic_public.h
@@ -0,0 +1,20 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_ATOMIC_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_ATOMIC_PUBLIC_H_
+
+#include "starboard/evergreen/arm/hardfp/atomic_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_ATOMIC_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm/hardfp/sbversion/12/configuration_public.h b/src/starboard/evergreen/arm/hardfp/sbversion/12/configuration_public.h
new file mode 100644
index 0000000..4be69b0
--- /dev/null
+++ b/src/starboard/evergreen/arm/hardfp/sbversion/12/configuration_public.h
@@ -0,0 +1,26 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The Starboard configuration for X86_64. Other devices will have
+// specific Starboard implementations.
+
+// Other source files should never include this header directly, but should
+// include the generic "starboard/configuration.h" instead.
+
+#ifndef STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+
+#include "starboard/evergreen/arm/hardfp/configuration_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_CONFIGURATION_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm/hardfp/sbversion/12/gyp_configuration.gypi b/src/starboard/evergreen/arm/hardfp/sbversion/12/gyp_configuration.gypi
new file mode 100644
index 0000000..0c67bd5
--- /dev/null
+++ b/src/starboard/evergreen/arm/hardfp/sbversion/12/gyp_configuration.gypi
@@ -0,0 +1,42 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+
+{
+ 'variables': {
+ 'sb_target_platform': 'evergreen-arm-hardfp',
+ },
+ 'target_defaults': {
+ 'default_configuration': 'evergreen-arm-hardfp-sbversion-12_debug',
+ 'configurations': {
+ 'evergreen-arm-hardfp-sbversion-12_debug': {
+ 'inherit_from': ['debug_base'],
+ },
+ 'evergreen-arm-hardfp-sbversion-12_devel': {
+ 'inherit_from': ['devel_base'],
+ },
+ 'evergreen-arm-hardfp-sbversion-12_qa': {
+ 'inherit_from': ['qa_base'],
+ },
+ 'evergreen-arm-hardfp-sbversion-12_gold': {
+ 'inherit_from': ['gold_base'],
+ },
+ }, # end of configurations
+ },
+ 'includes': [
+ '<(DEPTH)/starboard/evergreen/arm/shared/gyp_configuration.gypi',
+ ],
+}
diff --git a/src/starboard/evergreen/arm/hardfp/sbversion/12/gyp_configuration.py b/src/starboard/evergreen/arm/hardfp/sbversion/12/gyp_configuration.py
new file mode 100644
index 0000000..6097401
--- /dev/null
+++ b/src/starboard/evergreen/arm/hardfp/sbversion/12/gyp_configuration.py
@@ -0,0 +1,25 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+"""Starboard evergreen-arm-hardfp platform configuration for gyp_cobalt."""
+
+from starboard.evergreen.arm.shared import gyp_configuration as parent_configuration
+
+
+def CreatePlatformConfig():
+ return parent_configuration.EvergreenArmConfiguration(
+ 'evergreen-arm-hardfp-sbversion-12',
+ sabi_json_path='starboard/sabi/arm/hardfp/sabi-v12.json')
diff --git a/src/starboard/evergreen/arm/hardfp/sbversion/12/starboard_platform.gyp b/src/starboard/evergreen/arm/hardfp/sbversion/12/starboard_platform.gyp
new file mode 100644
index 0000000..29566d2
--- /dev/null
+++ b/src/starboard/evergreen/arm/hardfp/sbversion/12/starboard_platform.gyp
@@ -0,0 +1,25 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+
+{
+ 'includes': [
+ # Note that we are 'includes'ing a 'gyp' file, not a 'gypi' file. The idea
+ # is that we just want this file to *be* the parent gyp file.
+ '<(DEPTH)/starboard/evergreen/arm/hardfp/starboard_platform.gyp',
+ ],
+}
+
diff --git a/src/starboard/evergreen/arm/hardfp/sbversion/12/thread_types_public.h b/src/starboard/evergreen/arm/hardfp/sbversion/12/thread_types_public.h
new file mode 100644
index 0000000..903d6bd
--- /dev/null
+++ b/src/starboard/evergreen/arm/hardfp/sbversion/12/thread_types_public.h
@@ -0,0 +1,23 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file was initially generated by starboard/tools/create_derived_build.py,
+// though it may have been modified since its creation.
+
+#ifndef STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+
+#include "starboard/evergreen/arm/hardfp/thread_types_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM_HARDFP_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm/shared/gyp_configuration.py b/src/starboard/evergreen/arm/shared/gyp_configuration.py
index d442333..c6c67ed 100644
--- a/src/starboard/evergreen/arm/shared/gyp_configuration.py
+++ b/src/starboard/evergreen/arm/shared/gyp_configuration.py
@@ -35,7 +35,7 @@
platform_name='evergreen-arm',
asan_enabled_by_default=False,
goma_supports_compiler=True,
- sabi_json_path=None):
+ sabi_json_path='starboard/sabi/default/sabi.json'):
# pylint: disable=useless-super-delegation
super(EvergreenArmConfiguration,
self).__init__(platform_name, asan_enabled_by_default,
@@ -43,10 +43,10 @@
self.AppendApplicationConfigurationPath(os.path.dirname(__file__))
self._host_toolchain = None
- def GetTargetToolchain(self):
- return self.GetHostToolchain()
+ def GetTargetToolchain(self, **kwargs):
+ return self.GetHostToolchain(**kwargs)
- def GetHostToolchain(self):
+ def GetHostToolchain(self, **kwargs):
if not self._host_toolchain:
if not hasattr(self, 'host_compiler_environment'):
self.host_compiler_environment = build.GetHostCompilerEnvironment(
@@ -84,7 +84,8 @@
return filters
def GetVariables(self, configuration):
- variables = super(EvergreenArmConfiguration, self).GetVariables(configuration)
+ variables = super(EvergreenArmConfiguration,
+ self).GetVariables(configuration)
variables.update({
'include_path_platform_deploy_gypi':
'starboard/evergreen/arm/shared/platform_deploy.gypi',
diff --git a/src/starboard/evergreen/arm/softfp/configuration_public.h b/src/starboard/evergreen/arm/softfp/configuration_public.h
index 1743bba..b6ced7d 100644
--- a/src/starboard/evergreen/arm/softfp/configuration_public.h
+++ b/src/starboard/evergreen/arm/softfp/configuration_public.h
@@ -166,7 +166,7 @@
// Whether this platform has and should use an MMAP function to map physical
// memory to the virtual address space.
-#if SB_API_VERSION < SB_MMAP_REQUIRED_VERSION
+#if SB_API_VERSION < 12
#define SB_HAS_MMAP 1
#endif
diff --git a/src/starboard/evergreen/arm/softfp/gyp_configuration.py b/src/starboard/evergreen/arm/softfp/gyp_configuration.py
index 8c649b9..46418c1 100644
--- a/src/starboard/evergreen/arm/softfp/gyp_configuration.py
+++ b/src/starboard/evergreen/arm/softfp/gyp_configuration.py
@@ -22,4 +22,4 @@
def CreatePlatformConfig():
return parent_configuration.EvergreenArmConfiguration(
'evergreen-arm-softfp',
- sabi_json_path='starboard/sabi/arm/softfp/sabi.json')
+ sabi_json_path='starboard/sabi/arm/softfp/sabi-v{sb_api_version}.json')
diff --git a/src/starboard/evergreen/arm/softfp/sbversion/12/atomic_public.h b/src/starboard/evergreen/arm/softfp/sbversion/12/atomic_public.h
new file mode 100644
index 0000000..d11da25
--- /dev/null
+++ b/src/starboard/evergreen/arm/softfp/sbversion/12/atomic_public.h
@@ -0,0 +1,20 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_ATOMIC_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_ATOMIC_PUBLIC_H_
+
+#include "starboard/evergreen/arm/softfp/atomic_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_ATOMIC_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm/softfp/sbversion/12/configuration_public.h b/src/starboard/evergreen/arm/softfp/sbversion/12/configuration_public.h
new file mode 100644
index 0000000..e4f45f4
--- /dev/null
+++ b/src/starboard/evergreen/arm/softfp/sbversion/12/configuration_public.h
@@ -0,0 +1,26 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The Starboard configuration for X86_64. Other devices will have
+// specific Starboard implementations.
+
+// Other source files should never include this header directly, but should
+// include the generic "starboard/configuration.h" instead.
+
+#ifndef STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+
+#include "starboard/evergreen/arm/softfp/configuration_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_CONFIGURATION_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm/softfp/sbversion/12/gyp_configuration.gypi b/src/starboard/evergreen/arm/softfp/sbversion/12/gyp_configuration.gypi
new file mode 100644
index 0000000..d31f2b7
--- /dev/null
+++ b/src/starboard/evergreen/arm/softfp/sbversion/12/gyp_configuration.gypi
@@ -0,0 +1,42 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+
+{
+ 'variables': {
+ 'sb_target_platform': 'evergreen-arm-softfp',
+ },
+ 'target_defaults': {
+ 'default_configuration': 'evergreen-arm-softfp-sbversion-12_debug',
+ 'configurations': {
+ 'evergreen-arm-softfp-sbversion-12_debug': {
+ 'inherit_from': ['debug_base'],
+ },
+ 'evergreen-arm-softfp-sbversion-12_devel': {
+ 'inherit_from': ['devel_base'],
+ },
+ 'evergreen-arm-softfp-sbversion-12_qa': {
+ 'inherit_from': ['qa_base'],
+ },
+ 'evergreen-arm-softfp-sbversion-12_gold': {
+ 'inherit_from': ['gold_base'],
+ },
+ }, # end of configurations
+ },
+ 'includes': [
+ '<(DEPTH)/starboard/evergreen/arm/shared/gyp_configuration.gypi',
+ ],
+}
diff --git a/src/starboard/evergreen/arm/softfp/sbversion/12/gyp_configuration.py b/src/starboard/evergreen/arm/softfp/sbversion/12/gyp_configuration.py
new file mode 100644
index 0000000..f5d1aff
--- /dev/null
+++ b/src/starboard/evergreen/arm/softfp/sbversion/12/gyp_configuration.py
@@ -0,0 +1,25 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+"""Starboard evergreen-arm-softfp platform configuration for gyp_cobalt."""
+
+from starboard.evergreen.arm.shared import gyp_configuration as parent_configuration
+
+
+def CreatePlatformConfig():
+ return parent_configuration.EvergreenArmConfiguration(
+ 'evergreen-arm-softfp-sbversion-12',
+ sabi_json_path='starboard/sabi/arm/softfp/sabi-v12.json')
diff --git a/src/starboard/evergreen/arm/softfp/sbversion/12/starboard_platform.gyp b/src/starboard/evergreen/arm/softfp/sbversion/12/starboard_platform.gyp
new file mode 100644
index 0000000..b4aa959
--- /dev/null
+++ b/src/starboard/evergreen/arm/softfp/sbversion/12/starboard_platform.gyp
@@ -0,0 +1,25 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+
+{
+ 'includes': [
+ # Note that we are 'includes'ing a 'gyp' file, not a 'gypi' file. The idea
+ # is that we just want this file to *be* the parent gyp file.
+ '<(DEPTH)/starboard/evergreen/arm/softfp/starboard_platform.gyp',
+ ],
+}
+
diff --git a/src/starboard/evergreen/arm/softfp/sbversion/12/thread_types_public.h b/src/starboard/evergreen/arm/softfp/sbversion/12/thread_types_public.h
new file mode 100644
index 0000000..ac72552
--- /dev/null
+++ b/src/starboard/evergreen/arm/softfp/sbversion/12/thread_types_public.h
@@ -0,0 +1,23 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file was initially generated by starboard/tools/create_derived_build.py,
+// though it may have been modified since its creation.
+
+#ifndef STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+
+#include "starboard/evergreen/arm/softfp/thread_types_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM_SOFTFP_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm64/configuration_public.h b/src/starboard/evergreen/arm64/configuration_public.h
index 9d5aac5..73939b3 100644
--- a/src/starboard/evergreen/arm64/configuration_public.h
+++ b/src/starboard/evergreen/arm64/configuration_public.h
@@ -182,7 +182,7 @@
// Whether this platform has and should use an MMAP function to map physical
// memory to the virtual address space.
-#if SB_API_VERSION < SB_MMAP_REQUIRED_VERSION
+#if SB_API_VERSION < 12
#define SB_HAS_MMAP 1
#endif
diff --git a/src/starboard/evergreen/arm64/gyp_configuration.py b/src/starboard/evergreen/arm64/gyp_configuration.py
index a607170..fc09a0d 100644
--- a/src/starboard/evergreen/arm64/gyp_configuration.py
+++ b/src/starboard/evergreen/arm64/gyp_configuration.py
@@ -32,17 +32,17 @@
platform_name='evergreen-arm64',
asan_enabled_by_default=False,
goma_supports_compiler=True,
- sabi_json_path=None):
+ sabi_json_path='starboard/sabi/default/sabi.json'):
# pylint: disable=useless-super-delegation
super(EvergreenArm64Configuration,
self).__init__(platform_name, asan_enabled_by_default,
goma_supports_compiler, sabi_json_path)
self._host_toolchain = None
- def GetTargetToolchain(self):
- return self.GetHostToolchain()
+ def GetTargetToolchain(self, **kwargs):
+ return self.GetHostToolchain(**kwargs)
- def GetHostToolchain(self):
+ def GetHostToolchain(self, **kwargs):
if not self._host_toolchain:
if not hasattr(self, 'host_compiler_environment'):
self.host_compiler_environment = build.GetHostCompilerEnvironment(
@@ -78,7 +78,8 @@
return super(EvergreenArm64Configuration, self).GetTestFilters()
def GetVariables(self, configuration):
- variables = super(EvergreenArm64Configuration, self).GetVariables(configuration)
+ variables = super(EvergreenArm64Configuration,
+ self).GetVariables(configuration)
variables.update({
'include_path_platform_deploy_gypi':
'starboard/evergreen/arm64/platform_deploy.gypi',
@@ -88,4 +89,4 @@
def CreatePlatformConfig():
return EvergreenArm64Configuration(
- sabi_json_path='starboard/sabi/arm64/sabi.json')
+ sabi_json_path='starboard/sabi/arm64/sabi-v{sb_api_version}.json')
diff --git a/src/starboard/evergreen/arm64/sbversion/12/atomic_public.h b/src/starboard/evergreen/arm64/sbversion/12/atomic_public.h
new file mode 100644
index 0000000..2604b7e
--- /dev/null
+++ b/src/starboard/evergreen/arm64/sbversion/12/atomic_public.h
@@ -0,0 +1,20 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef STARBOARD_EVERGREEN_ARM64_SBVERSION_12_ATOMIC_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM64_SBVERSION_12_ATOMIC_PUBLIC_H_
+
+#include "starboard/evergreen/arm64/atomic_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM64_SBVERSION_12_ATOMIC_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm64/sbversion/12/configuration_public.h b/src/starboard/evergreen/arm64/sbversion/12/configuration_public.h
new file mode 100644
index 0000000..4ff33d9
--- /dev/null
+++ b/src/starboard/evergreen/arm64/sbversion/12/configuration_public.h
@@ -0,0 +1,26 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The Starboard configuration for X86_64. Other devices will have
+// specific Starboard implementations.
+
+// Other source files should never include this header directly, but should
+// include the generic "starboard/configuration.h" instead.
+
+#ifndef STARBOARD_EVERGREEN_ARM64_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM64_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+
+#include "starboard/evergreen/arm64/configuration_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM64_SBVERSION_12_CONFIGURATION_PUBLIC_H_
diff --git a/src/starboard/evergreen/arm64/sbversion/12/gyp_configuration.gypi b/src/starboard/evergreen/arm64/sbversion/12/gyp_configuration.gypi
new file mode 100644
index 0000000..5460de1
--- /dev/null
+++ b/src/starboard/evergreen/arm64/sbversion/12/gyp_configuration.gypi
@@ -0,0 +1,58 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+
+{
+ 'variables': {
+ 'yasm_exists': 1,
+ 'sb_target_platform': 'evergreen-arm64',
+
+ 'compiler_flags': [
+ '-isystem<(cobalt_repo_root)/third_party/musl/arch/aarch64',
+ ],
+ },
+
+ 'target_defaults': {
+ 'defines' : [
+ # Ensure that the Starboardized __external_threading file is included.
+ '_LIBCPP_HAS_THREAD_API_EXTERNAL',
+ # Ensure that only the forward declarations and type definitions are included
+ # in __external_threading.
+ '_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL',
+ # Enable GNU extensions to get prototypes like ffsl.
+ '_GNU_SOURCE=1',
+ ],
+ 'default_configuration': 'evergreen-arm64-sbversion-12_debug',
+ 'configurations': {
+ 'evergreen-arm64-sbversion-12_debug': {
+ 'inherit_from': ['debug_base'],
+ },
+ 'evergreen-arm64-sbversion-12_devel': {
+ 'inherit_from': ['devel_base'],
+ },
+ 'evergreen-arm64-sbversion-12_qa': {
+ 'inherit_from': ['qa_base'],
+ },
+ 'evergreen-arm64-sbversion-12_gold': {
+ 'inherit_from': ['gold_base'],
+ },
+ }, # end of configurations
+ },
+ 'includes': [
+ '<(DEPTH)/starboard/evergreen/shared/compiler_flags.gypi',
+ '<(DEPTH)/starboard/evergreen/shared/gyp_configuration.gypi',
+ ],
+}
diff --git a/src/starboard/evergreen/arm64/sbversion/12/gyp_configuration.py b/src/starboard/evergreen/arm64/sbversion/12/gyp_configuration.py
new file mode 100644
index 0000000..f0b21ba
--- /dev/null
+++ b/src/starboard/evergreen/arm64/sbversion/12/gyp_configuration.py
@@ -0,0 +1,22 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Starboard evergreen-arm64 platform configuration for gyp_cobalt."""
+
+from starboard.evergreen.arm64 import gyp_configuration as parent_configuration
+
+
+def CreatePlatformConfig():
+ return parent_configuration.EvergreenArm64Configuration(
+ platform_name='evergreen-arm64-sbversion-12',
+ sabi_json_path='starboard/sabi/arm64/sabi-v12.json')
diff --git a/src/starboard/evergreen/arm64/sbversion/12/starboard_platform.gyp b/src/starboard/evergreen/arm64/sbversion/12/starboard_platform.gyp
new file mode 100644
index 0000000..6b4361f
--- /dev/null
+++ b/src/starboard/evergreen/arm64/sbversion/12/starboard_platform.gyp
@@ -0,0 +1,21 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{
+ 'includes': [
+ # Note that we are 'includes'ing a 'gyp' file, not a 'gypi' file. The idea
+ # is that we just want this file to *be* the parent gyp file.
+ '<(DEPTH)/starboard/evergreen/arm64/starboard_platform.gyp',
+ ],
+}
diff --git a/src/starboard/evergreen/arm64/sbversion/12/thread_types_public.h b/src/starboard/evergreen/arm64/sbversion/12/thread_types_public.h
new file mode 100644
index 0000000..14e88b4
--- /dev/null
+++ b/src/starboard/evergreen/arm64/sbversion/12/thread_types_public.h
@@ -0,0 +1,23 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file was initially generated by starboard/tools/create_derived_build.py,
+// though it may have been modified since its creation.
+
+#ifndef STARBOARD_EVERGREEN_ARM64_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+#define STARBOARD_EVERGREEN_ARM64_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+
+#include "starboard/evergreen/arm64/thread_types_public.h"
+
+#endif // STARBOARD_EVERGREEN_ARM64_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
diff --git a/src/starboard/evergreen/sabi/sbversion/12/sabi_flags.gypi b/src/starboard/evergreen/sabi/sbversion/12/sabi_flags.gypi
new file mode 100644
index 0000000..160ef7f
--- /dev/null
+++ b/src/starboard/evergreen/sabi/sbversion/12/sabi_flags.gypi
@@ -0,0 +1,80 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Starboard Application Binary Interface
+#
+# This file translates the set of ABI variables, which should be overridden by
+# each platform, into platform-specific sets of compiler flags.
+
+{
+ 'variables': {
+ 'conditions': [
+ # arm
+ ['target_arch=="arm"', {
+ 'compiler_flags': [
+ '-march=arm<(target_arch_sub)',
+ ],
+ 'conditions': [
+ ['floating_point_abi=="soft"', {
+ 'compiler_flags': [
+ '-mfloat-abi=soft',
+ ],
+ }, {
+ 'compiler_flags': [
+ '-mfloat-abi=<(floating_point_abi)',
+ '-mfpu=<(floating_point_fpu)',
+ ],
+ }],
+ ['floating_point_abi=="hard"', {
+ 'compiler_flags': [
+ '-target', 'arm<(target_arch_sub)-none-eabihf',
+ ],
+ }, {
+ 'compiler_flags': [
+ '-target', 'arm<(target_arch_sub)-none-eabi',
+ ],
+ }],
+ ],
+ }],
+ # arm64
+ ['target_arch=="arm64"', {
+ 'compiler_flags': [
+ '-march=arm64<(target_arch_sub)',
+ '-target', 'arm64<(target_arch_sub)-unknown-unknown-elf',
+
+ # There is no software floating point support for arm64 / aarch64
+ # architectures. Thus, -mfloat-abi and -mfpu would simply be ignored.
+
+ # char is unsigned by default for arm64.
+ '-fsigned-char',
+ ],
+ }],
+ # x86
+ ['target_arch=="x86"', {
+ 'compiler_flags': [
+ '-march=i686',
+ '-target', 'i686-unknown-unknown-elf',
+ ],
+ }],
+ # x64
+ ['target_arch=="x64"', {
+ 'compiler_flags': [
+ '-march=x86-64',
+ '-target', 'x86_64-unknown-linux-elf',
+ ],
+ }],
+ ],
+ },
+}
+
diff --git a/src/starboard/evergreen/shared/gyp_configuration.gypi b/src/starboard/evergreen/shared/gyp_configuration.gypi
index e6a8911..ad8726b 100644
--- a/src/starboard/evergreen/shared/gyp_configuration.gypi
+++ b/src/starboard/evergreen/shared/gyp_configuration.gypi
@@ -26,6 +26,8 @@
'cobalt_v8_buildtime_snapshot': 1,
'cobalt_v8_enable_embedded_builtins': 1,
+ 'cobalt_font_package': 'minimal',
+
# Override that omits the "data" subdirectory.
# TODO: Remove when omitted for all platforms in base_configuration.gypi.
'sb_static_contents_output_data_dir': '<(PRODUCT_DIR)/content',
diff --git a/src/starboard/evergreen/shared/gyp_configuration.py b/src/starboard/evergreen/shared/gyp_configuration.py
index 3d9860f..d11e04c 100644
--- a/src/starboard/evergreen/shared/gyp_configuration.py
+++ b/src/starboard/evergreen/shared/gyp_configuration.py
@@ -29,7 +29,7 @@
platform,
asan_enabled_by_default=True,
goma_supports_compiler=True,
- sabi_json_path=None):
+ sabi_json_path='starboard/sabi/default/sabi.json'):
self.goma_supports_compiler = goma_supports_compiler
self.sabi_json_path = sabi_json_path
super(EvergreenConfiguration, self).__init__(platform,
@@ -48,8 +48,6 @@
variables.update({
'javascript_engine':
'v8',
- 'cobalt_enable_jit':
- 1,
'cobalt_repo_root':
paths.REPOSITORY_ROOT,
'include_path_platform_deploy_gypi':
@@ -90,8 +88,7 @@
return filters
__FILTERED_TESTS = { # pylint: disable=invalid-name
- 'nplb': ['MemoryReportingTest.CapturesMemMapUnmap',
- 'MemoryReportingTest.CapturesOperatorDeleteNothrow',
+ 'nplb': ['MemoryReportingTest.CapturesOperatorDeleteNothrow',
'SbAudioSinkTest.*',
'SbDrmTest.AnySupportedKeySystems'],
diff --git a/src/starboard/evergreen/shared/launcher.py b/src/starboard/evergreen/shared/launcher.py
index 5f18643..0be0a83 100644
--- a/src/starboard/evergreen/shared/launcher.py
+++ b/src/starboard/evergreen/shared/launcher.py
@@ -173,6 +173,18 @@
def SendSuspend(self):
return self.launcher.SendSuspend()
+ def SendConceal(self):
+ return self.launcher.SendConceal()
+
+ def SendFocus(self):
+ return self.launcher.SendFocus()
+
+ def SendFreeze(self):
+ return self.launcher.SendFreeze()
+
+ def SendStop(self):
+ return self.launcher.SendStop()
+
def SupportsDeepLink(self):
return self.launcher.SupportsDeepLink()
diff --git a/src/starboard/evergreen/x64/configuration_public.h b/src/starboard/evergreen/x64/configuration_public.h
index fe9c06d..89f8733 100644
--- a/src/starboard/evergreen/x64/configuration_public.h
+++ b/src/starboard/evergreen/x64/configuration_public.h
@@ -174,7 +174,7 @@
// Whether this platform has and should use an MMAP function to map physical
// memory to the virtual address space.
-#if SB_API_VERSION < SB_MMAP_REQUIRED_VERSION
+#if SB_API_VERSION < 12
#define SB_HAS_MMAP 1
#endif
diff --git a/src/starboard/evergreen/x64/gyp_configuration.py b/src/starboard/evergreen/x64/gyp_configuration.py
index 9c572b0..86174cd 100644
--- a/src/starboard/evergreen/x64/gyp_configuration.py
+++ b/src/starboard/evergreen/x64/gyp_configuration.py
@@ -35,7 +35,7 @@
platform_name='evergreen-x64',
asan_enabled_by_default=False,
goma_supports_compiler=True,
- sabi_json_path=None):
+ sabi_json_path='starboard/sabi/default/sabi.json'):
# pylint: disable=useless-super-delegation
super(EvergreenX64Configuration,
self).__init__(platform_name, asan_enabled_by_default,
@@ -43,10 +43,10 @@
self.AppendApplicationConfigurationPath(os.path.dirname(__file__))
self._host_toolchain = None
- def GetTargetToolchain(self):
- return self.GetHostToolchain()
+ def GetTargetToolchain(self, **kwargs):
+ return self.GetHostToolchain(**kwargs)
- def GetHostToolchain(self):
+ def GetHostToolchain(self, **kwargs):
if not self._host_toolchain:
if not hasattr(self, 'host_compiler_environment'):
self.host_compiler_environment = build.GetHostCompilerEnvironment(
@@ -97,7 +97,8 @@
return filters
def GetVariables(self, configuration):
- variables = super(EvergreenX64Configuration, self).GetVariables(configuration)
+ variables = super(EvergreenX64Configuration,
+ self).GetVariables(configuration)
variables.update({
'include_path_platform_deploy_gypi':
'starboard/evergreen/x64/platform_deploy.gypi',
@@ -107,4 +108,4 @@
def CreatePlatformConfig():
return EvergreenX64Configuration(
- sabi_json_path='starboard/sabi/x64/sysv/sabi.json')
+ sabi_json_path='starboard/sabi/x64/sysv/sabi-v{sb_api_version}.json')
diff --git a/src/starboard/evergreen/x64/sbversion/12/atomic_public.h b/src/starboard/evergreen/x64/sbversion/12/atomic_public.h
new file mode 100644
index 0000000..64e82a1
--- /dev/null
+++ b/src/starboard/evergreen/x64/sbversion/12/atomic_public.h
@@ -0,0 +1,20 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef STARBOARD_EVERGREEN_X64_SBVERSION_12_ATOMIC_PUBLIC_H_
+#define STARBOARD_EVERGREEN_X64_SBVERSION_12_ATOMIC_PUBLIC_H_
+
+#include "starboard/evergreen/x64/atomic_public.h"
+
+#endif // STARBOARD_EVERGREEN_X64_SBVERSION_12_ATOMIC_PUBLIC_H_
diff --git a/src/starboard/evergreen/x64/sbversion/12/configuration_public.h b/src/starboard/evergreen/x64/sbversion/12/configuration_public.h
new file mode 100644
index 0000000..2c411d7
--- /dev/null
+++ b/src/starboard/evergreen/x64/sbversion/12/configuration_public.h
@@ -0,0 +1,26 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The Starboard configuration for x64. Other devices will have
+// specific Starboard implementations.
+
+// Other source files should never include this header directly, but should
+// include the generic "starboard/configuration.h" instead.
+
+#ifndef STARBOARD_EVERGREEN_X64_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+#define STARBOARD_EVERGREEN_X64_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+
+#include "starboard/evergreen/x64/configuration_public.h"
+
+#endif // STARBOARD_EVERGREEN_X64_SBVERSION_12_CONFIGURATION_PUBLIC_H_
diff --git a/src/starboard/evergreen/x64/sbversion/12/gyp_configuration.gypi b/src/starboard/evergreen/x64/sbversion/12/gyp_configuration.gypi
new file mode 100644
index 0000000..fa4e5a1
--- /dev/null
+++ b/src/starboard/evergreen/x64/sbversion/12/gyp_configuration.gypi
@@ -0,0 +1,58 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+
+{
+ 'variables': {
+ 'yasm_exists': 1,
+ 'sb_target_platform': 'evergreen-x64',
+
+ 'compiler_flags': [
+ '-isystem<(cobalt_repo_root)/third_party/musl/arch/x86_64',
+ ],
+ },
+
+ 'target_defaults': {
+ 'defines' : [
+ # Ensure that the Starboardized __external_threading file is included.
+ '_LIBCPP_HAS_THREAD_API_EXTERNAL',
+ # Ensure that only the forward declarations and type definitions are included
+ # in __external_threading.
+ '_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL',
+ # Enable GNU extensions to get prototypes like ffsl.
+ '_GNU_SOURCE=1',
+ ],
+ 'default_configuration': 'evergreen-x64-sbversion-12_debug',
+ 'configurations': {
+ 'evergreen-x64-sbversion-12_debug': {
+ 'inherit_from': ['debug_base'],
+ },
+ 'evergreen-x64-sbversion-12_devel': {
+ 'inherit_from': ['devel_base'],
+ },
+ 'evergreen-x64-sbversion-12_qa': {
+ 'inherit_from': ['qa_base'],
+ },
+ 'evergreen-x64-sbversion-12_gold': {
+ 'inherit_from': ['gold_base'],
+ },
+ }, # end of configurations
+ },
+ 'includes': [
+ '<(DEPTH)/starboard/evergreen/shared/gyp_configuration.gypi',
+ '<(DEPTH)/starboard/evergreen/shared/compiler_flags.gypi',
+ ],
+}
diff --git a/src/starboard/evergreen/x64/sbversion/12/gyp_configuration.py b/src/starboard/evergreen/x64/sbversion/12/gyp_configuration.py
new file mode 100644
index 0000000..a5ce04a
--- /dev/null
+++ b/src/starboard/evergreen/x64/sbversion/12/gyp_configuration.py
@@ -0,0 +1,22 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Starboard evergreen-x64 platform configuration for gyp_cobalt."""
+
+from starboard.evergreen.x64 import gyp_configuration as parent_configuration
+
+
+def CreatePlatformConfig():
+ return parent_configuration.EvergreenX64Configuration(
+ platform_name='evergreen-x64-sbversion-12',
+ sabi_json_path='starboard/sabi/x64/sysv/sabi-v12.json')
diff --git a/src/starboard/evergreen/x64/sbversion/12/starboard_platform.gyp b/src/starboard/evergreen/x64/sbversion/12/starboard_platform.gyp
new file mode 100644
index 0000000..ad9035d
--- /dev/null
+++ b/src/starboard/evergreen/x64/sbversion/12/starboard_platform.gyp
@@ -0,0 +1,21 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{
+ 'includes': [
+ # Note that we are 'includes'ing a 'gyp' file, not a 'gypi' file. The idea
+ # is that we just want this file to *be* the parent gyp file.
+ '<(DEPTH)/starboard/evergreen/x64/starboard_platform.gyp',
+ ],
+}
diff --git a/src/starboard/evergreen/x64/sbversion/12/thread_types_public.h b/src/starboard/evergreen/x64/sbversion/12/thread_types_public.h
new file mode 100644
index 0000000..2695e58
--- /dev/null
+++ b/src/starboard/evergreen/x64/sbversion/12/thread_types_public.h
@@ -0,0 +1,23 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file was initially generated by starboard/tools/create_derived_build.py,
+// though it may have been modified since its creation.
+
+#ifndef STARBOARD_EVERGREEN_X64_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+#define STARBOARD_EVERGREEN_X64_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+
+#include "starboard/evergreen/x64/thread_types_public.h"
+
+#endif // STARBOARD_EVERGREEN_X64_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
diff --git a/src/starboard/evergreen/x86/gyp_configuration.py b/src/starboard/evergreen/x86/gyp_configuration.py
index a67484c..5ac4c8e 100644
--- a/src/starboard/evergreen/x86/gyp_configuration.py
+++ b/src/starboard/evergreen/x86/gyp_configuration.py
@@ -35,17 +35,17 @@
platform_name='evergreen-x86',
asan_enabled_by_default=False,
goma_supports_compiler=True,
- sabi_json_path=None):
+ sabi_json_path='starboard/sabi/default/sabi.json'):
# pylint: disable=useless-super-delegation
super(EvergreenX86Configuration,
self).__init__(platform_name, asan_enabled_by_default,
goma_supports_compiler, sabi_json_path)
self._host_toolchain = None
- def GetTargetToolchain(self):
- return self.GetHostToolchain()
+ def GetTargetToolchain(self, **kwargs):
+ return self.GetHostToolchain(**kwargs)
- def GetHostToolchain(self):
+ def GetHostToolchain(self, **kwargs):
if not self._host_toolchain:
if not hasattr(self, 'host_compiler_environment'):
self.host_compiler_environment = build.GetHostCompilerEnvironment(
@@ -98,4 +98,4 @@
def CreatePlatformConfig():
return EvergreenX86Configuration(
- sabi_json_path='starboard/sabi/x86/sabi.json')
+ sabi_json_path='starboard/sabi/x86/sabi-v{sb_api_version}.json')
diff --git a/src/starboard/evergreen/x86/sbversion/12/atomic_public.h b/src/starboard/evergreen/x86/sbversion/12/atomic_public.h
new file mode 100644
index 0000000..216d7b6
--- /dev/null
+++ b/src/starboard/evergreen/x86/sbversion/12/atomic_public.h
@@ -0,0 +1,20 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef STARBOARD_EVERGREEN_X86_SBVERSION_12_ATOMIC_PUBLIC_H_
+#define STARBOARD_EVERGREEN_X86_SBVERSION_12_ATOMIC_PUBLIC_H_
+
+#include "starboard/evergreen/x86/atomic_public.h"
+
+#endif // STARBOARD_EVERGREEN_X86_SBVERSION_12_ATOMIC_PUBLIC_H_
diff --git a/src/starboard/evergreen/x86/sbversion/12/configuration_public.h b/src/starboard/evergreen/x86/sbversion/12/configuration_public.h
new file mode 100644
index 0000000..a8dfb83
--- /dev/null
+++ b/src/starboard/evergreen/x86/sbversion/12/configuration_public.h
@@ -0,0 +1,26 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// The Starboard configuration for x86. Other devices will have
+// specific Starboard implementations.
+
+// Other source files should never include this header directly, but should
+// include the generic "starboard/configuration.h" instead.
+
+#ifndef STARBOARD_EVERGREEN_X86_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+#define STARBOARD_EVERGREEN_X86_SBVERSION_12_CONFIGURATION_PUBLIC_H_
+
+#include "starboard/evergreen/x86/configuration_public.h"
+
+#endif // STARBOARD_EVERGREEN_X86_SBVERSION_12_CONFIGURATION_PUBLIC_H_
diff --git a/src/starboard/evergreen/x86/sbversion/12/gyp_configuration.gypi b/src/starboard/evergreen/x86/sbversion/12/gyp_configuration.gypi
new file mode 100644
index 0000000..9c5fb14
--- /dev/null
+++ b/src/starboard/evergreen/x86/sbversion/12/gyp_configuration.gypi
@@ -0,0 +1,58 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This file was initially generated by starboard/tools/create_derived_build.py,
+# though it may have been modified since its creation.
+
+{
+ 'variables': {
+ 'yasm_exists': 1,
+ 'sb_target_platform': 'evergreen-x86',
+
+ 'compiler_flags': [
+ '-isystem<(cobalt_repo_root)/third_party/musl/arch/i386',
+ ],
+ },
+
+ 'target_defaults': {
+ 'defines' : [
+ # Ensure that the Starboardized __external_threading file is included.
+ '_LIBCPP_HAS_THREAD_API_EXTERNAL',
+ # Ensure that only the forward declarations and type definitions are included
+ # in __external_threading.
+ '_LIBCPP_HAS_THREAD_LIBRARY_EXTERNAL',
+ # Enable GNU extensions to get prototypes like ffsl.
+ '_GNU_SOURCE=1',
+ ],
+ 'default_configuration': 'evergreen-x86-sbversion-12_debug',
+ 'configurations': {
+ 'evergreen-x86-sbversion-12_debug': {
+ 'inherit_from': ['debug_base'],
+ },
+ 'evergreen-x86-sbversion-12_devel': {
+ 'inherit_from': ['devel_base'],
+ },
+ 'evergreen-x86-sbversion-12_qa': {
+ 'inherit_from': ['qa_base'],
+ },
+ 'evergreen-x86-sbversion-12_gold': {
+ 'inherit_from': ['gold_base'],
+ },
+ }, # end of configurations
+ },
+ 'includes': [
+ '<(DEPTH)/starboard/evergreen/shared/gyp_configuration.gypi',
+ '<(DEPTH)/starboard/evergreen/shared/compiler_flags.gypi',
+ ],
+}
diff --git a/src/starboard/evergreen/x86/sbversion/12/gyp_configuration.py b/src/starboard/evergreen/x86/sbversion/12/gyp_configuration.py
new file mode 100644
index 0000000..0b040a4
--- /dev/null
+++ b/src/starboard/evergreen/x86/sbversion/12/gyp_configuration.py
@@ -0,0 +1,22 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Starboard evergreen-x86 platform configuration for gyp_cobalt."""
+
+from starboard.evergreen.x86 import gyp_configuration as parent_configuration
+
+
+def CreatePlatformConfig():
+ return parent_configuration.EvergreenX86Configuration(
+ platform_name='evergreen-x86-sbversion-12',
+ sabi_json_path='starboard/sabi/x86/sabi-v12.json')
diff --git a/src/starboard/evergreen/x86/sbversion/12/starboard_platform.gyp b/src/starboard/evergreen/x86/sbversion/12/starboard_platform.gyp
new file mode 100644
index 0000000..8fa33ef
--- /dev/null
+++ b/src/starboard/evergreen/x86/sbversion/12/starboard_platform.gyp
@@ -0,0 +1,21 @@
+# Copyright 2019 The Cobalt Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{
+ 'includes': [
+ # Note that we are 'includes'ing a 'gyp' file, not a 'gypi' file. The idea
+ # is that we just want this file to *be* the parent gyp file.
+ '<(DEPTH)/starboard/evergreen/shared/starboard_platform.gyp',
+ ],
+}
diff --git a/src/starboard/evergreen/x86/sbversion/12/thread_types_public.h b/src/starboard/evergreen/x86/sbversion/12/thread_types_public.h
new file mode 100644
index 0000000..bca9e4d
--- /dev/null
+++ b/src/starboard/evergreen/x86/sbversion/12/thread_types_public.h
@@ -0,0 +1,23 @@
+// Copyright 2019 The Cobalt Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This file was initially generated by starboard/tools/create_derived_build.py,
+// though it may have been modified since its creation.
+
+#ifndef STARBOARD_EVERGREEN_X86_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+#define STARBOARD_EVERGREEN_X86_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
+
+#include "starboard/evergreen/x86/thread_types_public.h"
+
+#endif // STARBOARD_EVERGREEN_X86_SBVERSION_12_THREAD_TYPES_PUBLIC_H_
