diff options
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/gn_to_bp.py | 5 | ||||
| -rw-r--r-- | gn/gn_to_bp_utils.py | 7 | ||||
| -rw-r--r-- | gn/gpu.gni | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gn/gn_to_bp.py b/gn/gn_to_bp.py index 8ad221c93a..34dd49ae3c 100644 --- a/gn/gn_to_bp.py +++ b/gn/gn_to_bp.py @@ -251,6 +251,11 @@ srcs .add("third_party/skcms/skcms.c") local_includes.add("third_party/skcms") dm_includes .add("third_party/skcms") +# need to manually include the vulkanmemoryallocator headers. If HWUI ever needs +# direct access to the allocator we need to add it to export_includes as well. +srcs.add("third_party/vulkanmemoryallocator/GrVulkanMemoryAllocator.cpp") +local_includes.add("third_party/vulkanmemoryallocator/") + # No need to list headers. srcs = {s for s in srcs if not s.endswith('.h')} dm_srcs = {s for s in dm_srcs if not s.endswith('.h')} diff --git a/gn/gn_to_bp_utils.py b/gn/gn_to_bp_utils.py index 65456408cd..78217a79db 100644 --- a/gn/gn_to_bp_utils.py +++ b/gn/gn_to_bp_utils.py @@ -45,6 +45,13 @@ def GrabDependentValues(js, name, value_type, list_to_extend, exclude): def CleanupCFlags(cflags): # Only use the generated flags related to warnings. cflags = {s for s in cflags if s.startswith('-W')} + # Add additional warning suppressions so we can build + # third_party/vulkanmemoryallocator + cflags = cflags.union([ + "-Wno-thread-safety-analysis", + "-Wno-missing-field-initializers", + "-Wno-unused-variable", + ]) # Add the rest of the flags we want. cflags = cflags.union([ "-fvisibility=hidden", diff --git a/gn/gpu.gni b/gn/gpu.gni index 14059fde75..d0e7f7f150 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -535,8 +535,11 @@ skia_vk_sources = [ "$_include/gpu/vk/GrVkBackendContext.h", "$_include/gpu/vk/GrVkDefines.h", "$_include/gpu/vk/GrVkInterface.h", + "$_include/gpu/vk/GrVkMemoryAllocator.h", "$_include/gpu/vk/GrVkTypes.h", "$_include/private/GrVkTypesPriv.h", + "$_src/gpu/vk/GrVkAMDMemoryAllocator.cpp", + "$_src/gpu/vk/GrVkAMDMemoryAllocator.h", "$_src/gpu/vk/GrVkBackendContext.cpp", "$_src/gpu/vk/GrVkBuffer.cpp", "$_src/gpu/vk/GrVkBuffer.h", |