commit 160eccc11ece7e591a5d153688c4849ece3f8768
author Lingfeng Yang <lfy@google.com> Tue Feb 04 22:40:00 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 04 22:40:00 2020 +0000
tree f231d82e2c6221a07593768e7125b2b2fd8c9c58
parent b65946f0729f226dbc7168ff43fa4845907dac65
parent c9e9c7bf7d213e0083da9f52f82563c37662dcf0

Merge changes from topic "vulkan-ignored-handles-flag"

* changes:
  vulkan: fix issues in VkGraphicsPipelineCreateInfo marshaling (take codegen)
  Put handle ignoring behind a flag

Android.mk

diff --git a/Android.mk b/Android.mk
index ce83f67..7afa40a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -149,7 +149,11 @@
 include $(GOLDFISH_OPENGL_PATH)/system/GLESv2/Android.mk
 
 include $(GOLDFISH_OPENGL_PATH)/system/gralloc/Android.mk
+
+ifneq (true,$(GOLDFISH_OPENGL_BUILD_FOR_HOST))
 include $(GOLDFISH_OPENGL_PATH)/system/hals/Android.mk
+endif
+
 include $(GOLDFISH_OPENGL_PATH)/system/cbmanager/Android.mk
 
 include $(GOLDFISH_OPENGL_PATH)/system/egl/Android.mk

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eba847a..9c58ad1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # instead run make from .../device/generic/goldfish-opengl
 # which will re-generate this file.
 set(GOLDFISH_DEVICE_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/./Android.mk" "2c3250b596a2b161e479dd3624a74ae6e485d6238d59d9a5dc55064c46482943")
+android_validate_sha256("${GOLDFISH_DEVICE_ROOT}/./Android.mk" "c8e5536771d09cd120c3e396beac994a1e2d2880f37b4e3bd1844be4cfc31555")
 add_subdirectory(shared/OpenglCodecCommon)
 add_subdirectory(system/GLESv1_enc)
 add_subdirectory(system/GLESv2_enc)
@@ -14,4 +14,4 @@
 add_subdirectory(system/GLESv2)
 add_subdirectory(system/gralloc)
 add_subdirectory(system/egl)
-add_subdirectory(system/vulkan)
+add_subdirectory(system/vulkan)
\ No newline at end of file