Make layers build on android.

3 files changed, 188 insertions, 0 deletions

diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh
new file mode 100755
index 00000000..e1ee4d9b
--- /dev/null
+++ b/buildAndroid/android-generate.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Copyright 2015 The Android Open Source Project
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#      http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+rm -rf generated
+mkdir -p generated
+python ../vk-generate.py dispatch-table-ops layer > generated/vk_dispatch_table_helper.h
+
+python ../vk_helper.py --gen_enum_string_helper ../include/vulkan.h --abs_out_dir generated
+python ../vk_helper.py --gen_struct_wrappers ../include/vulkan.h --abs_out_dir generated
+
+python ../vk-layer-generate.py Generic ../include/vulkan.h > generated/generic_layer.cpp
+python ../vk-layer-generate.py APIDump ../include/vulkan.h > generated/api_dump.cpp
+python ../vk-layer-generate.py ObjectTracker ../include/vulkan.h > generated/object_track.cpp
+python ../vk-layer-generate.py Threading ../include/vulkan.h > generated/threading.cpp
+
diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk
new file mode 100644
index 00000000..c9270f14
--- /dev/null
+++ b/buildAndroid/jni/Android.mk
@@ -0,0 +1,140 @@
+# Copyright 2015 The Android Open Source Project

+

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+

+#      http://www.apache.org/licenses/LICENSE-2.0

+

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+

+LOCAL_PATH := $(abspath $(call my-dir))

+MY_PATH := $(LOCAL_PATH)

+SRC_DIR := $(LOCAL_PATH)/../../

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := layer_utils

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerBasic

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/basic.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/buildAndroid/generated

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerDrawState

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/draw_state.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerMemTracker

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/mem_tracker.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerShaderCheker

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/shader_checker.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerImage

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerParamChecker

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/param_checker.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerGeneric

+LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/generic_layer.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/layers \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerAPIDump

+LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/api_dump.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/layers \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerObjectTracker

+LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/object_track.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/layers \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

+

+include $(CLEAR_VARS)

+LOCAL_MODULE := VKLayerThreading

+LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/threading.cpp

+LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp

+LOCAL_C_INCLUDES += $(SRC_DIR)/include \

+		    $(SRC_DIR)/layers \

+		    $(SRC_DIR)/buildAndroid/generated \

+		    $(SRC_DIR)/loader

+LOCAL_SHARED_LIBRARIES += layer_utils

+LOCAL_LDLIBS    := -llog

+include $(BUILD_SHARED_LIBRARY)

diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk
new file mode 100644
index 00000000..492aa406
--- /dev/null
+++ b/buildAndroid/jni/Application.mk
@@ -0,0 +1,20 @@
+# Copyright 2015 The Android Open Source Project

+

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+

+#      http://www.apache.org/licenses/LICENSE-2.0

+

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+

+APP_ABI := all

+APP_PLATFORM := android-22

+APP_STL := gnustl_static

+APP_MODULES := layer_utils VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerShaderCheker VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading

+APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES

+NDK_TOOLCHAIN_VERSION := 4.8