Use select() for gfxstream mesa3d_platforms flag
Minor cleanup, as it's now supported for srcs since b/358377461
Bug: 326956485
Test: m
Change-Id: I4dad7fb4debc30e1cd95cfacaac95a8f53ed539e
diff --git a/Android.bp b/Android.bp
index 4f17387..197c4a7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -100,17 +100,6 @@
],
}
-soong_config_module_type {
- name: "gfxstream_cc_defaults_config_for_platform",
- module_type: "cc_defaults",
- config_namespace: "gfxstream",
- variables: ["mesa3d_platforms"],
- properties: [
- "cflags",
- "target.android.srcs",
- ],
-}
-
soong_config_string_variable {
name: "mesa3d_platforms",
values: [
@@ -120,34 +109,23 @@
],
}
-gfxstream_cc_defaults_config_for_platform {
- name: "gfxstream_guest_cc_defaults_for_platform",
- soong_config_variables: {
- mesa3d_platforms: {
- // Android surfaceless build
- none: {
- cflags: [
- "-UANDROID",
- "-U__ANDROID__",
- "-DLINUX_GUEST_BUILD",
- ],
- },
- // The default when variable is not set is Android
- conditions_default: {
- cflags: [
- "-DVK_USE_PLATFORM_ANDROID_KHR",
- ],
- },
- },
- },
-}
-
cc_defaults {
name: "gfxstream_guest_cc_defaults",
defaults: [
"gfxstream_cc_defaults",
- "gfxstream_guest_cc_defaults_for_platform",
],
+ cflags: select(soong_config_variable("gfxstream", "mesa3d_platforms"), {
+ // Android surfaceless build
+ "none": [
+ "-UANDROID",
+ "-U__ANDROID__",
+ "-DLINUX_GUEST_BUILD",
+ ],
+ // The default when variable is not set is Android
+ default: [
+ "-DVK_USE_PLATFORM_ANDROID_KHR",
+ ],
+ }),
}
cc_defaults {
diff --git a/guest/mesa/Android.bp b/guest/mesa/Android.bp
index d803299..52cd8b9 100644
--- a/guest/mesa/Android.bp
+++ b/guest/mesa/Android.bp
@@ -18,7 +18,7 @@
header_libs: ["mesa_common_headers_gfxstream"],
defaults: [
- "gfxstream_guest_cc_defaults_for_platform",
+ "gfxstream_guest_cc_defaults",
],
cflags: [
diff --git a/guest/mesa/src/vulkan/runtime/Android.bp b/guest/mesa/src/vulkan/runtime/Android.bp
index a11b2e7..156456f 100644
--- a/guest/mesa/src/vulkan/runtime/Android.bp
+++ b/guest/mesa/src/vulkan/runtime/Android.bp
@@ -185,36 +185,12 @@
"$(location vk_format_info.c)",
}
-soong_config_module_type_import {
- from: "hardware/google/gfxstream/Android.bp",
- module_types: ["gfxstream_cc_defaults_config_for_platform"],
-}
-
-gfxstream_cc_defaults_config_for_platform {
- name: "libmesa_vulkan_runtime_gfxstream_cc_defaults_for_platform",
- soong_config_variables: {
- mesa3d_platforms: {
- // Android surfaceless build
- none: {},
- // The default when variable is not set is Android
- conditions_default: {
- target: {
- android: {
- srcs: ["vk_android.c"],
- },
- },
- },
- },
- },
-}
-
cc_library_static {
name: "libmesa_vulkan_runtime_gfxstream",
host_supported: true,
vendor: true,
defaults: [
"mesa_common_defaults_gfxstream",
- "libmesa_vulkan_runtime_gfxstream_cc_defaults_for_platform",
],
header_libs: [
"mesa_common_headers_gfxstream",
@@ -294,6 +270,14 @@
],
target: {
android: {
+ srcs: select(soong_config_variable("gfxstream", "mesa3d_platforms"), {
+ // Android surfaceless build
+ "none": [],
+ // The default when variable is not set is Android
+ default: [
+ "vk_android.c",
+ ],
+ }),
shared_libs: [
"libnativewindow",
"libsync",
diff --git a/guest/vulkan_enc/Android.bp b/guest/vulkan_enc/Android.bp
index ac3c7cd..5d76fa9 100644
--- a/guest/vulkan_enc/Android.bp
+++ b/guest/vulkan_enc/Android.bp
@@ -108,7 +108,7 @@
name: "libvulkan_enc",
defaults: [
"libgfxstream_guest_cc_defaults",
- "gfxstream_guest_cc_defaults_for_platform",
+ "gfxstream_guest_cc_defaults",
"libplatform_virtgpu_defaults",
],
header_libs: [
