Changed android-generated.bat for windows (not tested )

9 files changed, 50 insertions, 13 deletions

diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index bf053528d..bef5cb6e6 100644
--- a/build-android/android-generate.bat
+++ b/build-android/android-generate.bat
@@ -17,17 +17,54 @@ REM # limitations under the License.
 if exist generated (
   rmdir /s /q generated
 )
-mkdir generated
+mkdir generated\include generated\common
 
-python ../vk-generate.py Android dispatch-table-ops layer > generated/vk_dispatch_table_helper.h
+python ../vk-generate.py Android dispatch-table-ops layer > generated/include/vk_dispatch_table_helper.h
 
-python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated
-python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated
+python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated/include
+python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated/include
 
-python ../vk-layer-generate.py Android object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp
-python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h > generated/unique_objects.cpp
+python ../vk-layer-generate.py Android object_tracker ../include/vulkan/vulkan.h > generated/include/object_tracker.cpp
+python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h > generated/include/unique_objects.cpp
 
-cd generated
-python ../../genvk.py threading -registry ../../vk.xml thread_check.h
-python ../../genvk.py paramchecker -registry ../../vk.xml parameter_validation.h
-cd ..
+cd generated/include
+python ../../../genvk.py threading -registry ../../../vk.xml thread_check.h
+python ../../../genvk.py paramchecker -registry ../../../vk.xml parameter_validation.h
+cd ../..
+
+copy /Y ..\layers\vk_layer_config.cpp   generated\common\
+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\
+
+REM create build-script root directory
+mkdir generated\gradle-build
+cd generated\gradle-build
+mkdir  core_validation device_limits image object_tracker parameter_validation swapchain threading unique_objects
+cd ..\..
+mkdir generated\layer-src
+cd generated\layer-src
+mkdir  core_validation device_limits image object_tracker parameter_validation swapchain threading unique_objects
+cd ..\..
+xcopy /s gradle-templates\*   generated\gradle-build\
+
+copy ..\layers\core_validation.cpp   generated\layer-src\core_validation
+echo apply from: "../common.gradle"  > generated\gradle-build\core_validation\build.gradle
+copy ..\layers\device_limits.cpp   generated\layer-src\device_limits
+echo apply from: "../common.gradle"  > generated\gradle-build\device_limits\build.gradle
+copy ..\layers\image.cpp   generated\layer-src\image
+echo apply from: "../common.gradle"  > generated\gradle-build\image\build.gradle
+copy ..\layers\parameter_validation.cpp   generated\layer-src\parameter_validation
+echo apply from: "../common.gradle"  > generated\gradle-build\parameter_validation\build.gradle
+copy ..\layers\swapchain.cpp   generated\layer-src\swapchain
+echo apply from: "../common.gradle"  > generated\gradle-build\swapchain\build.gradle
+copy ..\layers\threading.cpp   generated\layer-src\threading
+echo apply from: "../common.gradle"  > generated\gradle-build\threading\build.gradle
+copy generated\include\object_tracker.cpp   generated\layer-src\object_tracker
+echo apply from: "../common.gradle"  > generated\gradle-build\object_tracker\build.gradle
+copy generated\include\unique_objects.cpp   generated\layer-src\unique_objects
+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
+
+del  /f /q generated\include\object_tracker.cpp
+del  /f /q generated\include\unique_objects.cpp
diff --git a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/cache.properties b/build-android/gradle-templates/.gradle/2.10/taskArtifacts/cache.properties
deleted file mode 100644
index f4c915743..000000000
--- a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/cache.properties
+++ /dev/null
@@ -1 +0,0 @@
-#Tue Mar 29 11:04:00 PDT 2016
diff --git a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/cache.properties.lock b/build-android/gradle-templates/.gradle/2.10/taskArtifacts/cache.properties.lock
deleted file mode 100644
index 3ca26e289..000000000
--- a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/cache.properties.lock
+++ /dev/null
diff --git a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/compilationState.bin b/build-android/gradle-templates/.gradle/2.10/taskArtifacts/compilationState.bin
deleted file mode 100644
index fe28f62d2..000000000
--- a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/compilationState.bin
+++ /dev/null
diff --git a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/fileHashes.bin b/build-android/gradle-templates/.gradle/2.10/taskArtifacts/fileHashes.bin
deleted file mode 100644
index f81674721..000000000
--- a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/fileHashes.bin
+++ /dev/null
diff --git a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/fileSnapshots.bin b/build-android/gradle-templates/.gradle/2.10/taskArtifacts/fileSnapshots.bin
deleted file mode 100644
index 41f584798..000000000
--- a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/fileSnapshots.bin
+++ /dev/null
diff --git a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/outputFileStates.bin b/build-android/gradle-templates/.gradle/2.10/taskArtifacts/outputFileStates.bin
deleted file mode 100644
index a60104d86..000000000
--- a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/outputFileStates.bin
+++ /dev/null
diff --git a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/taskArtifacts.bin b/build-android/gradle-templates/.gradle/2.10/taskArtifacts/taskArtifacts.bin
deleted file mode 100644
index 8b8fa053f..000000000
--- a/build-android/gradle-templates/.gradle/2.10/taskArtifacts/taskArtifacts.bin
+++ /dev/null
diff --git a/build-android/gradle-templates/local.properties b/build-android/gradle-templates/local.properties
index 62d2af127..667955948 100644
--- a/build-android/gradle-templates/local.properties
+++ b/build-android/gradle-templates/local.properties
@@ -8,5 +8,6 @@
 # For customization when using a Version Control System, please read the
 # header note.
 #Mon Mar 28 09:29:17 PDT 2016
-sdk.dir=/Users/gfan/dev/sdk_current
-ndk.dir=/Users/gfan/dev/ndk_current
\ No newline at end of file
+sdk.dir=/path/to/your/android_sdk
+ndk.dir=/path/to/your/android_ndk
+