diff options
| author | Cody Northrop <cnorthrop@google.com> | 2018-05-15 12:08:52 -0600 |
|---|---|---|
| committer | cnorthrop <cnorthrop@google.com> | 2018-05-16 15:55:35 -0600 |
| commit | 9f1ebf7c8f8c4cb2bd06d523f740db9a55fc899d (patch) | |
| tree | 8ba69c7a489ec376ce9525f28af2d2ff401e4ec8 /cube | |
| parent | 53ac380440abba0b80344882d9d5d46327669ea9 (diff) | |
| download | usermoji-9f1ebf7c8f8c4cb2bd06d523f740db9a55fc899d.tar.xz | |
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.
Diffstat (limited to 'cube')
| -rw-r--r-- | cube/android/jni/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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 \ |