commit 70caaf8646f4a648b359ad1226dbd99969c335c2
author Michael Jurka <mikejurka@google.com> Fri Sep 15 12:56:04 2017 -0700
committer Michael Jurka <mikejurka@google.com> Fri Sep 15 12:56:04 2017 -0700
tree 67e8ae57e0fb78247472c11b89cf98c77940c05b
parent 635ac1b61ce71c8ebe8c9bb4dc5fbea71b605005

Fix the output path for generated header files.

MA-315

Change-Id: Ic8ec161b07dfcab7371f46e035f9756d400932e7

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 05d823b..8d7aa0f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -43,7 +43,7 @@
 
 action("generate_extra_vulkan_headers") {
   script = "build-fuchsia/fuchsia-generate.sh"
-  args = [ rebase_path(target_gen_dir, "build-fuchsia" ) ]
+  args = [ rebase_path(target_gen_dir, "." ) ]
   inputs = [
     "scripts/dispatch_table_helper_generator.py",
     "scripts/helper_file_generator.py",

build-fuchsia/fuchsia-generate.sh

diff --git a/build-fuchsia/fuchsia-generate.sh b/build-fuchsia/fuchsia-generate.sh
index 58f3d39..1c6e086 100755
--- a/build-fuchsia/fuchsia-generate.sh
+++ b/build-fuchsia/fuchsia-generate.sh
@@ -18,18 +18,19 @@
 
 if [ -z "$1" ]
   then
-    echo "Usage: fuchsia-generate.sh OUTPUT_DIR"
+    echo "Usage: fuchsia-generate.sh TARGET_GEN_DIR"
     exit 1
 fi
 
-SOURCE_DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-OUTPUT_DIR=$1
+function realpath { echo $(cd -P $(dirname $1); pwd)/$(basename $1); }
+# Get full path for the parent of this script
+SOURCE_DIR=$(realpath $(dirname $0))
+# Get full path for our gen directory
+OUTPUT_DIR=$(realpath $1)
 OUTPUT_INCLUDE_DIR=$OUTPUT_DIR/generated/include
+
 rm -rf $OUTPUT_DIR/generated
 mkdir -p $OUTPUT_INCLUDE_DIR
-dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-cd $dir
-
 
 ( cd $SOURCE_DIR; python $SOURCE_DIR/../scripts/lvl_genvk.py -registry $SOURCE_DIR/../scripts/vk.xml -o $OUTPUT_INCLUDE_DIR vk_safe_struct.h 2> /dev/null )
 ( cd $SOURCE_DIR; python $SOURCE_DIR/../scripts/lvl_genvk.py -registry $SOURCE_DIR/../scripts/vk.xml -o $OUTPUT_INCLUDE_DIR vk_safe_struct.cpp 2> /dev/null )