diff --git a/src/dawn/native/CMakeLists.txt b/src/dawn/native/CMakeLists.txt
index 2f80cbec2a..16bde830b8 100644
--- a/src/dawn/native/CMakeLists.txt
+++ b/src/dawn/native/CMakeLists.txt
@@ -625,7 +625,13 @@ if (DAWN_ENABLE_VULKAN)
     target_link_libraries(dawn_native PUBLIC Vulkan-Headers)
     target_include_directories(dawn_native PRIVATE ${DAWN_VULKAN_TOOLS_DIR})
 
-    if (UNIX AND NOT APPLE)
+    if (ANDROID)
+        target_sources(dawn_native PRIVATE
+            "vulkan/external_memory/MemoryServiceAHardwareBuffer.cpp"
+            "vulkan/external_semaphore/ServiceImplementationFD.cpp"
+            "vulkan/external_semaphore/ServiceImplementationFD.h"
+        )
+    elseif (UNIX AND NOT APPLE)
         target_sources(dawn_native PRIVATE
             "vulkan/external_memory/MemoryServiceImplementationDmaBuf.cpp"
             "vulkan/external_memory/MemoryServiceImplementationDmaBuf.h"
diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
index 47ad676ad1..0fb7342c57 100644
--- a/third_party/CMakeLists.txt
+++ b/third_party/CMakeLists.txt
@@ -53,7 +53,7 @@ if(NOT TARGET glslang AND ${TINT_BUILD_GLSL_WRITER} AND ${TINT_BUILD_SAMPLES})
     add_subdirectory("${DAWN_THIRD_PARTY_DIR}/vulkan-deps/glslang/src" "${CMAKE_CURRENT_BINARY_DIR}/glslang" EXCLUDE_FROM_ALL)
 endif()
 
-if (NOT TARGET glfw)
+if (NOT TARGET glfw AND DAWN_SUPPORTS_GLFW_FOR_WINDOWING)
     set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
     set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
     set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)