From: Courtney Goeltzenleuchter Date: Tue, 22 Mar 2016 22:27:25 +0000 (-0600) Subject: GH171: Fix for NDK packaging X-Git-Tag: submit/tizen/20181227.054638~3523 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4b61e018ec349a785124cc937378d4a2d453ec3;p=platform%2Fupstream%2FVulkan-Tools.git GH171: Fix for NDK packaging Script depends on current working directory to be this same as where the script lives so make sure that's the case. Return 0 so NDK tools know things were successful. --- diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index e5d3886f..928a1762 100755 --- a/buildAndroid/android-generate.sh +++ b/buildAndroid/android-generate.sh @@ -15,6 +15,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P) +cd $dir + rm -rf generated mkdir -p generated python ../vk-generate.py Android dispatch-table-ops layer > generated/vk_dispatch_table_helper.h @@ -27,3 +30,4 @@ python ../vk-layer-generate.py Android unique_objects ../include/vulkan/vulkan.h ( cd generated; python ../../genvk.py threading -registry ../../vk.xml thread_check.h ) ( cd generated; python ../../genvk.py paramchecker -registry ../../vk.xml parameter_validation.h ) +exit 0