Change skia repository location.

BUILDS/BUILD.skia

 
 cc_import(
     name = "skia_public",
-    hdrs = glob(["include/**/*.h"]),
-    shared_library = "lib/libskia.so",
+    hdrs = glob(["**/*.h"]),
+    shared_library = "out/Shared/libskia.so",
     visibility = ["//visibility:public"],
 )

WORKSPACE.bazel

@@ -16,7 +16,7 @@ new_local_repository(
 # Skia library
 new_local_repository(
     name = "skia",
-    path = "./external/build/skia",
+    path = "./external/skia",
     build_file = "BUILDS/BUILD.skia"
 )
 

prepare.sh

@@ -13,32 +13,34 @@ if [ ! -d "${EXTERNAL_BUILD_DIR}" ]; then
 fi
 
 # Build skia
-SKIA_BUILD_DIR=${EXTERNAL_BUILD_DIR}/skia
+# SKIA_BUILD_DIR=${EXTERNAL_BUILD_DIR}/skia
 
 cd $SKIA_PATH
+
+builds=$(find . | grep bazel | xargs)
+if [ ! -z "$builds" ]; then
+   rm $builds
+fi
+
 python3 tools/git-sync-deps
 bin/gn gen out/Shared --args='is_official_build=true is_component_build=true skia_use_system_harfbuzz=false'
 ninja -C out/Shared
 
 
-if [ ! -d "${SKIA_BUILD_DIR}" ]; then
-    mkdir ${SKIA_BUILD_DIR}
-    mkdir ${SKIA_BUILD_DIR}/include
-    mkdir ${SKIA_BUILD_DIR}/lib
-else
-    rm -rf ${SKIA_BUILD_DIR}/include/*
-    rm -rf ${SKIA_BUILD_DIR}/lib/*
-fi
+# if [ ! -d "${SKIA_BUILD_DIR}" ]; then
+#     mkdir ${SKIA_BUILD_DIR}
+#     mkdir ${SKIA_BUILD_DIR}/include
+#     mkdir ${SKIA_BUILD_DIR}/lib
+# else
+#     rm -rf ${SKIA_BUILD_DIR}/include/*
+#     rm -rf ${SKIA_BUILD_DIR}/lib/*
+# fi
 
-cp out/Shared/*.so ${SKIA_BUILD_DIR}/lib
-cp -r include ${SKIA_BUILD_DIR}/
+# cp out/Shared/*.so ${SKIA_BUILD_DIR}/lib
+# cp -r include ${SKIA_BUILD_DIR}/
 
-cd $SKIA_BUILD_DIR
-builds=$(find . | grep bazel | xargs)
+# cd $SKIA_BUILD_DIR
 
-if [ ! -z "$builds" ]; then
-   rm $builds
-fi
 
 # Build ffmpeg
 FFMPEG_BUILD_DIR=${EXTERNAL_BUILD_DIR}/ffmpeg

src/BUILD.bazel

@@ -15,7 +15,6 @@ cc_library(
     ],
     copts = [
         "-I./external/ffmpeg/include",
-        "-I./external/skia/include",
         "-std=c++2a"
     ],
     visibility = [