From 81d3ccf77015698bc09c67c22be2e70aa3bb1953 Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Tue, 3 May 2016 15:38:05 -0600 Subject: [PATCH] android: Move external deps into project dir Mirroring commit d288cb9a, stop using directories outside of our project location to host external files. Small changes to update_external_sources_android.sh/bat to find glslang, spirv-tool, shaderc in "external" instead of ".." --- build-android/gradle-templates/common.gradle | 2 +- build-android/gradle-templates/win.template.gradle | 2 +- build-android/jni/Android.mk | 22 +++++++++++----------- build-android/update_external_sources_android.bat | 2 +- build-android/update_external_sources_android.sh | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build-android/gradle-templates/common.gradle b/build-android/gradle-templates/common.gradle index f0219c6..cedc1d7 100644 --- a/build-android/gradle-templates/common.gradle +++ b/build-android/gradle-templates/common.gradle @@ -41,7 +41,7 @@ model { "-I${file("../../../../include")}".toString(), "-I${file("../../../../loader")}".toString(), "-I${file("../../include")}".toString(), - "-I${file("../../../../../glslang")}".toString()]) + "-I${file("../../../../external/glslang")}".toString()]) } // Turn on hard float support in armeabi-v7a diff --git a/build-android/gradle-templates/win.template.gradle b/build-android/gradle-templates/win.template.gradle index 6efae6f..07596af 100644 --- a/build-android/gradle-templates/win.template.gradle +++ b/build-android/gradle-templates/win.template.gradle @@ -35,7 +35,7 @@ model { "-I${file("../../../../include")}".toString(), "-I${file("../../../../loader")}".toString(), "-I${file("../../include")}".toString(), - "-I${file("../../../../../glslang")}".toString()]) + "-I${file("../../../../external/glslang")}".toString()]) } // Turn on hard float support in armeabi-v7a diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index 49cb9f4..5a08135 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -37,8 +37,8 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ $(LAYER_DIR)/include \ $(SRC_DIR)/loader \ - $(SRC_DIR)/../glslang \ - $(SRC_DIR)/../spirv-tools/include + $(SRC_DIR)/external/glslang \ + $(SRC_DIR)/external/spirv-tools/include LOCAL_STATIC_LIBRARIES += layer_utils SPIRV-Tools-prebuilt LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog @@ -139,42 +139,42 @@ include $(BUILD_SHARED_LIBRARY) # Pull in prebuilt shaderc include $(CLEAR_VARS) LOCAL_MODULE := shaderc-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := glslang-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libglslang.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libglslang.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := OGLCompiler-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOGLCompiler.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOGLCompiler.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := OSDependent-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOSDependent.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOSDependent.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := HLSL-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libHLSL.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libHLSL.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := shaderc_util-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc_util.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc_util.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := SPIRV-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := SPIRV-Tools-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/../shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools.a +LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -189,7 +189,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/libs \ $(SRC_DIR)/common \ $(SRC_DIR)/icd/common \ - $(SRC_DIR)/../shaderc/libshaderc/include/ + $(SRC_DIR)/external/shaderc/libshaderc/include LOCAL_STATIC_LIBRARIES := googletest_main layer_utils LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt HLSL-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt diff --git a/build-android/update_external_sources_android.bat b/build-android/update_external_sources_android.bat index 08d9630..fd394f4 100755 --- a/build-android/update_external_sources_android.bat +++ b/build-android/update_external_sources_android.bat @@ -22,7 +22,7 @@ setlocal EnableDelayedExpansion set errorCode=0 set ANDROID_BUILD_DIR=%~dp0 set BUILD_DIR=%ANDROID_BUILD_DIR%.. -set BASE_DIR=%BUILD_DIR%\.. +set BASE_DIR=%BUILD_DIR%\external set GLSLANG_DIR=%BASE_DIR%\glslang set SPIRV_TOOLS_DIR=%BASE_DIR%\spirv-tools set SHADERC_DIR=%BASE_DIR%\shaderc diff --git a/build-android/update_external_sources_android.sh b/build-android/update_external_sources_android.sh index b40a367..e728d89 100755 --- a/build-android/update_external_sources_android.sh +++ b/build-android/update_external_sources_android.sh @@ -20,7 +20,7 @@ set -e ANDROIDBUILDDIR=$PWD BUILDDIR=$ANDROIDBUILDDIR/.. -BASEDIR=$BUILDDIR/.. +BASEDIR=$BUILDDIR/external GLSLANG_REVISION=$(cat $ANDROIDBUILDDIR/glslang_revision_android) SPIRV_TOOLS_REVISION=$(cat $ANDROIDBUILDDIR/spirv-tools_revision_android) -- 2.7.4