From 9f1ebf7c8f8c4cb2bd06d523f740db9a55fc899d Mon Sep 17 00:00:00 2001
From: Cody Northrop <cnorthrop@google.com>
Date: Tue, 15 May 2018 12:08:52 -0600
Subject: android: Fixes for cube

This restores files that were dropped during the split.

Also migrates support files to this repo, which we will remove
from Vulkan-ValidationLayers and treat like a submodule.

Updates to travis to build cube.
---
 cube/android/jni/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cube/android')

diff --git a/cube/android/jni/Android.mk b/cube/android/jni/Android.mk
index 66018314..b814e46a 100644
--- a/cube/android/jni/Android.mk
+++ b/cube/android/jni/Android.mk
@@ -15,14 +15,14 @@
 
 LOCAL_PATH := $(abspath $(call my-dir))
 SRC_DIR := $(LOCAL_PATH)/../../..
-DEMO_DIR := $(SRC_DIR)/demos
+DEMO_DIR := $(SRC_DIR)/cube
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := Cube
 LOCAL_SRC_FILES += $(DEMO_DIR)/cube.c \
                    $(SRC_DIR)/common/vulkan_wrapper.cpp \
                    $(SRC_DIR)/common/android_util.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/include \
+LOCAL_C_INCLUDES += $(SRC_DIR)/Vulkan-Headers/include \
                     $(DEMO_DIR)/android/include \
                     $(SRC_DIR)/libs \
                     $(SRC_DIR)/common \
-- 
cgit v1.2.3