From c8fb4e5af6321fb6e78b6a1683b8c590765c00d8 Mon Sep 17 00:00:00 2001 From: Kaido Kert Date: Tue, 17 Sep 2024 17:20:39 -0700 Subject: [PATCH] Delete android-vulkan config This has been unused for years. In the future, we'll delegate Vulkan configuration to Skia. b/150410605 --- starboard/android/apk/app/CMakeLists.txt | 22 ------------- starboard/android/apk/app/build.gradle | 3 -- starboard/android/arm64/vulkan/BUILD.gn | 19 ------------ starboard/android/arm64/vulkan/args.gn | 17 ---------- .../android/arm64/vulkan/atomic_public.h | 20 ------------ .../arm64/vulkan/configuration_public.h | 20 ------------ .../android/arm64/vulkan/gyp_configuration.py | 20 ------------ .../vulkan/platform_configuration/BUILD.gn | 31 ------------------- .../platform_configuration/configuration.gni | 21 ------------- .../android/arm64/vulkan/test_filters.py | 28 ----------------- .../android/arm64/vulkan/toolchain/BUILD.gn | 31 ------------------- starboard/android/shared/install_target.gni | 2 -- .../platform_configuration/configuration.gni | 4 --- starboard/build/platforms.py | 1 - 14 files changed, 239 deletions(-) delete mode 100644 starboard/android/arm64/vulkan/BUILD.gn delete mode 100644 starboard/android/arm64/vulkan/args.gn delete mode 100644 starboard/android/arm64/vulkan/atomic_public.h delete mode 100644 starboard/android/arm64/vulkan/configuration_public.h delete mode 100644 starboard/android/arm64/vulkan/gyp_configuration.py delete mode 100644 starboard/android/arm64/vulkan/platform_configuration/BUILD.gn delete mode 100644 starboard/android/arm64/vulkan/platform_configuration/configuration.gni delete mode 100644 starboard/android/arm64/vulkan/test_filters.py delete mode 100644 starboard/android/arm64/vulkan/toolchain/BUILD.gn diff --git a/starboard/android/apk/app/CMakeLists.txt b/starboard/android/apk/app/CMakeLists.txt index d10920b646c5..c1c812d30f9c 100644 --- a/starboard/android/apk/app/CMakeLists.txt +++ b/starboard/android/apk/app/CMakeLists.txt @@ -131,25 +131,3 @@ add_library(native SHARED ${CMAKE_CURRENT_BINARY_DIR}/phony.cpp) # Add a dependency to run the external cobalt build as a side effect of # building the phony native library. add_dependencies(native external_cobalt_build) - -if (ENABLE_VULKAN) - # Add angle shared libraries. - list(APPEND angle_libs EGL_angle GLESv1_CM_angle - GLESv2_angle feature_support_angle c++_shared) - - # Copy each library into APK. - foreach(angle_lib IN LISTS angle_libs) - add_dependencies(native ${angle_lib}_lib) - add_library(${angle_lib} SHARED IMPORTED) - set_target_properties(${angle_lib} PROPERTIES - IMPORTED_LOCATION - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${angle_lib}.so - ) - add_custom_target(${angle_lib}_lib - DEPENDS external_cobalt_build - COMMAND ${CMAKE_COMMAND} -E copy - ${COBALT_PRODUCT_DIR}/lib/lib${angle_lib}.so - ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/lib${angle_lib}.so - ) - endforeach() -endif() diff --git a/starboard/android/apk/app/build.gradle b/starboard/android/apk/app/build.gradle index 55ba2b964ea1..8e775bd553a1 100644 --- a/starboard/android/apk/app/build.gradle +++ b/starboard/android/apk/app/build.gradle @@ -34,8 +34,6 @@ ext { project.hasProperty('cobaltContentDir') ? new File(cobaltContentDir).canonicalPath : '' cobaltLibraryDir = project.hasProperty('cobaltLibraryDir') ? new File(cobaltLibraryDir).canonicalPath : '' - enableVulkan = - project.hasProperty('enableVulkan') ? enableVulkan : 0 evergreenCompatible = project.hasProperty('evergreenCompatible') ? evergreenCompatible : "false" @@ -93,7 +91,6 @@ android { arguments "-DCOBALT_CONTENT_DIR=${cobaltContentDir}" arguments "-DCOBALT_LIBRARY_DIR=${cobaltLibraryDir}" arguments "-DCOBALT_PLATFORM_DEPLOY=${project.hasProperty('cobaltDeployApk')}" - arguments "-DENABLE_VULKAN=${enableVulkan}" arguments "-DEVERGREEN_COMPATIBLE=${evergreenCompatible}" } } diff --git a/starboard/android/arm64/vulkan/BUILD.gn b/starboard/android/arm64/vulkan/BUILD.gn deleted file mode 100644 index dc694b6aaae7..000000000000 --- a/starboard/android/arm64/vulkan/BUILD.gn +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2021 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. - -static_library("starboard_platform") { - configs += [ "//starboard/build/config:starboard_implementation" ] - - public_deps = [ "//starboard/android/shared:starboard_platform" ] -} diff --git a/starboard/android/arm64/vulkan/args.gn b/starboard/android/arm64/vulkan/args.gn deleted file mode 100644 index 64c4ff93f07b..000000000000 --- a/starboard/android/arm64/vulkan/args.gn +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2022 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. - -target_platform = "android-arm64" -target_os = "android" -target_cpu = "arm64" diff --git a/starboard/android/arm64/vulkan/atomic_public.h b/starboard/android/arm64/vulkan/atomic_public.h deleted file mode 100644 index ae8ac7f958cd..000000000000 --- a/starboard/android/arm64/vulkan/atomic_public.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2020 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_ANDROID_ARM64_VULKAN_ATOMIC_PUBLIC_H_ -#define STARBOARD_ANDROID_ARM64_VULKAN_ATOMIC_PUBLIC_H_ - -#include "starboard/android/shared/atomic_public.h" - -#endif // STARBOARD_ANDROID_ARM64_VULKAN_ATOMIC_PUBLIC_H_ diff --git a/starboard/android/arm64/vulkan/configuration_public.h b/starboard/android/arm64/vulkan/configuration_public.h deleted file mode 100644 index 61313f640ac9..000000000000 --- a/starboard/android/arm64/vulkan/configuration_public.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2020 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_ANDROID_ARM64_VULKAN_CONFIGURATION_PUBLIC_H_ -#define STARBOARD_ANDROID_ARM64_VULKAN_CONFIGURATION_PUBLIC_H_ - -#include "starboard/android/shared/configuration_public.h" - -#endif // STARBOARD_ANDROID_ARM64_VULKAN_CONFIGURATION_PUBLIC_H_ diff --git a/starboard/android/arm64/vulkan/gyp_configuration.py b/starboard/android/arm64/vulkan/gyp_configuration.py deleted file mode 100644 index 3d39bfb3b223..000000000000 --- a/starboard/android/arm64/vulkan/gyp_configuration.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2020 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 Android ARM-64 Vulkan platform build configuration.""" - -from starboard.android.shared import gyp_configuration as shared_configuration - - -def CreatePlatformConfig(): - return shared_configuration.AndroidConfiguration('android-arm64-vulkan') diff --git a/starboard/android/arm64/vulkan/platform_configuration/BUILD.gn b/starboard/android/arm64/vulkan/platform_configuration/BUILD.gn deleted file mode 100644 index d9a5bdcf43dd..000000000000 --- a/starboard/android/arm64/vulkan/platform_configuration/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2021 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. - -config("platform_configuration") { - configs = [ "//starboard/android/shared/platform_configuration" ] - - libs = [ - "c++_shared", - "EGL_angle", - "GLESv2_angle", - "GLESv1_CM_angle", - "feature_support_angle", - ] - - ldflags = [ - "-Wl", - "--verbose", - "-Llib", - ] -} diff --git a/starboard/android/arm64/vulkan/platform_configuration/configuration.gni b/starboard/android/arm64/vulkan/platform_configuration/configuration.gni deleted file mode 100644 index b90be0f8f70b..000000000000 --- a/starboard/android/arm64/vulkan/platform_configuration/configuration.gni +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2021 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. - -import("//starboard/android/shared/platform_configuration/configuration.gni") - -android_abi = "arm64-v8a" -arm_version = 8 -sabi_path = "//starboard/sabi/arm64/sabi-v$sb_api_version.json" - -enable_vulkan = true diff --git a/starboard/android/arm64/vulkan/test_filters.py b/starboard/android/arm64/vulkan/test_filters.py deleted file mode 100644 index b44d9cda8526..000000000000 --- a/starboard/android/arm64/vulkan/test_filters.py +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2022 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 Android ARM-64 Vulkan Platform Test Filters.""" - -from starboard.android.shared import test_filters as shared_test_filters - - -def CreateTestFilters(): - return AndroidArm64VulkanTestFilters() - - -class AndroidArm64VulkanTestFilters(shared_test_filters.TestFilters): - """Starboard Android ARM-64 Vulkan Platform Test Filters.""" - - def GetTestFilters(self): - filters = super().GetTestFilters() - return filters diff --git a/starboard/android/arm64/vulkan/toolchain/BUILD.gn b/starboard/android/arm64/vulkan/toolchain/BUILD.gn deleted file mode 100644 index 923694b02a6b..000000000000 --- a/starboard/android/arm64/vulkan/toolchain/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2021 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. - -import("//build/config/clang/clang.gni") -import("//build/toolchain/gcc_toolchain.gni") -import("//starboard/android/shared/toolchain/toolchain.gni") - -gcc_toolchain("target") { - prefix = rebase_path("$android_toolchain_path/bin", root_build_dir) - cc = "$prefix/aarch64-linux-android${android_ndk_api_level}-clang" - cxx = "$prefix/aarch64-linux-android${android_ndk_api_level}-clang++" - ld = cxx - readelf = "readelf" - ar = "ar" - nm = "nm" - - toolchain_args = { - is_clang = true - } -} diff --git a/starboard/android/shared/install_target.gni b/starboard/android/shared/install_target.gni index ad1b07bf7918..5b3b280cbbe6 100644 --- a/starboard/android/shared/install_target.gni +++ b/starboard/android/shared/install_target.gni @@ -89,8 +89,6 @@ template("install_target") { "-P", "cobaltTarget=$installable_target_name", "-P", - "enableVulkan=$enable_vulkan", - "-P", "evergreenCompatible=$sb_is_evergreen_compatible", "assembleCobalt_$gradle_build_type", "-Dorg.gradle.workers.max=$num_gradle_workers", diff --git a/starboard/android/shared/platform_configuration/configuration.gni b/starboard/android/shared/platform_configuration/configuration.gni index 6070c77d7038..2cf84ba9726a 100644 --- a/starboard/android/shared/platform_configuration/configuration.gni +++ b/starboard/android/shared/platform_configuration/configuration.gni @@ -14,10 +14,6 @@ import("//starboard/build/config/base_configuration.gni") -declare_args() { - enable_vulkan = false -} - final_executable_type = "shared_library" gtest_target_type = "shared_library" starboard_level_final_executable_type = "shared_library" diff --git a/starboard/build/platforms.py b/starboard/build/platforms.py index 5681d3bf11b0..dd34cbb4757d 100644 --- a/starboard/build/platforms.py +++ b/starboard/build/platforms.py @@ -32,7 +32,6 @@ 'linux-x64x11-clang-3-9': 'starboard/linux/x64x11/clang/3.9', 'android-arm': 'starboard/android/arm', 'android-arm64': 'starboard/android/arm64', - 'android-arm64-vulkan': 'starboard/android/arm64/vulkan', 'android-x86': 'starboard/android/x86', 'raspi-2': 'starboard/raspi/2', 'raspi-2-skia': 'starboard/raspi/2/skia',