diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2017-01-11 11:36:16 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2017-01-17 14:58:38 -0700 |
| commit | c06c9b88f5f5bcc7033ba41d5547b048fa6015a4 (patch) | |
| tree | c1b241c70225b3eb14abb88291965d5e888be7bc /build-android | |
| parent | 21809be3476cb74ebef25c85ba3cfd8a93ba675f (diff) | |
layers: Move CreateImage recording to buf/img module
- Move source from core_validation.cpp into new module
- Add new module to layers cmake file
- Update android build scripts/makefiles for new files
Change-Id: Ia4000b26384d96a551d727f5e37997372f01764a
Diffstat (limited to 'build-android')
| -rw-r--r-- | build-android/android-generate.bat | 2 | ||||
| -rwxr-xr-x | build-android/android-generate.sh | 2 | ||||
| -rw-r--r-- | build-android/jni/Android.mk | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index 283be55c..257dedc9 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -36,6 +36,7 @@ copy /Y ..\layers\vk_layer_extension_utils.cpp generated\common\ copy /Y ..\layers\vk_layer_utils.cpp generated\common\
copy /Y ..\layers\vk_layer_table.cpp generated\common\
copy /Y ..\layers\descriptor_sets.cpp generated\common\
+copy /Y ..\layers\buffer_validation.cpp generated\common\
REM create build-script root directory
mkdir generated\gradle-build
@@ -52,6 +53,7 @@ for %%G in (core_validation image object_tracker parameter_validation swapchain echo apply from: "../common.gradle" > generated\gradle-build\%%G\build.gradle
)
copy generated\common\descriptor_sets.cpp generated\layer-src\core_validation\descriptor_sets.cpp
+copy generated\common\buffer_validation.cpp generated\layer-src\core_validation\buffer_validation.cpp
copy generated\include\vk_safe_struct.cpp generated\layer-src\core_validation\vk_safe_struct.cpp
move generated\include\vk_safe_struct.cpp generated\layer-src\unique_objects\vk_safe_struct.cpp
echo apply from: "../common.gradle" > generated\gradle-build\unique_objects\build.gradle
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index 09022a39..662c4f01 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -36,6 +36,7 @@ cp -f ../layers/vk_layer_extension_utils.cpp generated/common/ cp -f ../layers/vk_layer_utils.cpp generated/common/ cp -f ../layers/vk_layer_table.cpp generated/common/ cp -f ../layers/descriptor_sets.cpp generated/common/ +cp -f ../layers/buffer_validation.cpp generated/common/ # layer names and their original source files directory # 1 to 1 correspondence -- one layer one source file; additional files are copied @@ -61,6 +62,7 @@ done # fixup - unique_objects need one more file cp generated/common/descriptor_sets.cpp ${SRC_ROOT}/core_validation/descriptor_sets.cpp +cp generated/common/buffer_validation.cpp ${SRC_ROOT}/core_validation/buffer_validation.cpp cp generated/include/vk_safe_struct.cpp ${SRC_ROOT}/core_validation/vk_safe_struct.cpp mv generated/include/vk_safe_struct.cpp ${SRC_ROOT}/unique_objects/vk_safe_struct.cpp diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 4577d0b4..4d325941 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -33,6 +33,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_core_validation LOCAL_SRC_FILES += $(LAYER_DIR)/layer-src/core_validation/core_validation.cpp LOCAL_SRC_FILES += $(LAYER_DIR)/layer-src/core_validation/descriptor_sets.cpp +LOCAL_SRC_FILES += $(LAYER_DIR)/layer-src/core_validation/buffer_validation.cpp LOCAL_SRC_FILES += $(LAYER_DIR)/common/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ |