From 16dc8919ac4d3bfbfe1f8664c401d3490a972fe4 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 19 Apr 2016 19:01:55 -0600 Subject: android: Unify source used for build.gradle In previous commit we modified build.gradle to be cross platform, so we can stop using the windows specific version. --- build-android/android-generate.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat index b8143009..6b37db0f 100644 --- a/build-android/android-generate.bat +++ b/build-android/android-generate.bat @@ -49,14 +49,14 @@ cd ..\.. xcopy /s gradle-templates\* generated\gradle-build\ for %%G in (core_validation device_limits image parameter_validation swapchain threading) Do ( copy ..\layers\%%G.cpp generated\layer-src\%%G - echo apply from: "../win.template.gradle" > generated\gradle-build\%%G\build.gradle + echo apply from: "../common.gradle" > generated\gradle-build\%%G\build.gradle ) copy generated\include\object_tracker.cpp generated\layer-src\object_tracker -echo apply from: "../win.template.gradle" > generated\gradle-build\object_tracker\build.gradle +echo apply from: "../common.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 +echo apply from: "../common.gradle" > generated\gradle-build\unique_objects\build.gradle del /f /q generated\include\object_tracker.cpp del /f /q generated\include\unique_objects.cpp -- cgit v1.2.3