Delete android-vulkan config

This has been unused for years. In the future, we'll delegate Vulkan configuration to Skia. b/150410605
youtube · Sep 18, 2024 · c8fb4e5 · c8fb4e5
1 parent faa7a7e
commit c8fb4e5
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 239 deletions.
diff --git 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
@@ -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
diff --git a/starboard/android/arm64/vulkan/args.gn b/starboard/android/arm64/vulkan/args.gn
diff --git a/starboard/android/arm64/vulkan/atomic_public.h b/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
diff --git a/starboard/android/arm64/vulkan/gyp_configuration.py b/starboard/android/arm64/vulkan/gyp_configuration.py
diff --git a/starboard/android/arm64/vulkan/platform_configuration/BUILD.gn b/starboard/android/arm64/vulkan/platform_configuration/BUILD.gn
diff --git a/starboard/android/arm64/vulkan/platform_configuration/configuration.gni b/starboard/android/arm64/vulkan/platform_configuration/configuration.gni
diff --git a/starboard/android/arm64/vulkan/test_filters.py b/starboard/android/arm64/vulkan/test_filters.py
diff --git a/starboard/android/arm64/vulkan/toolchain/BUILD.gn b/starboard/android/arm64/vulkan/toolchain/BUILD.gn
diff --git 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
@@ -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
@@ -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',