summaryrefslogtreecommitdiff
path: root/build-android
diff options
context:
space:
mode:
authorCody Northrop <cnorthrop@google.com>2016-04-19 19:01:55 -0600
committerTobin Ehlis <tobine@google.com>2016-04-20 11:01:26 -0600
commitff60941acd6643ae9f9c9480f8cad8ad1df517e5 (patch)
treec6cbba051a9041d335ca3c443c66abf5b611ebed /build-android
parente14559d8d7beb9557e4e18719586fe2aad2987da (diff)
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.
Diffstat (limited to 'build-android')
-rw-r--r--build-android/android-generate.bat6
1 files 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