diff options
| author | Cody Northrop <cnorthrop@google.com> | 2016-04-07 13:50:07 -0600 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-04-07 15:00:38 -0600 |
| commit | 04b833b3f588154eac435f4c3ae81bf33c81d772 (patch) | |
| tree | 2806882bb7f030b4aa54e6e031fb1d000be0f812 | |
| parent | 1e1dce8ff45a99f9fb65f48416ba0b35ad16b16b (diff) | |
| download | usermoji-04b833b3f588154eac435f4c3ae81bf33c81d772.tar.xz | |
android: Update to get gradlew working again
| -rw-r--r-- | build-android/android-generate.bat | 1 | ||||
| -rwxr-xr-x | build-android/android-generate.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index 303177eb..b8143009 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -54,6 +54,7 @@ for %%G in (core_validation device_limits image parameter_validation swapchain t copy generated\include\object_tracker.cpp generated\layer-src\object_tracker
echo apply from: "../win.template.gradle" > generated\gradle-build\object_tracker\build.gradle
copy generated\include\unique_objects.cpp generated\layer-src\unique_objects
+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: "../win.template.gradle" > generated\gradle-build\unique_objects\build.gradle
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh index 0ded569b..dd5ab20d 100755 --- a/build-android/android-generate.sh +++ b/build-android/android-generate.sh @@ -59,6 +59,7 @@ do done # fixup - unique_objects need one more file +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 # fixup - remove copied files from generated/include |