From 5a1d518f54642134a9d13f057f8e407d57512a1b Mon Sep 17 00:00:00 2001 From: Cody Northrop Date: Thu, 3 Nov 2016 14:44:55 -0600 Subject: [PATCH] android: Move external under build-android --- build-android/jni/Android.mk | 27 ++++++++++++----------- build-android/update_external_sources_android.bat | 2 +- build-android/update_external_sources_android.sh | 2 +- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk index b19c3b9..09d0ceb 100644 --- a/build-android/jni/Android.mk +++ b/build-android/jni/Android.mk @@ -16,6 +16,7 @@ LOCAL_PATH := $(abspath $(call my-dir)) SRC_DIR := $(LOCAL_PATH)/../../ LAYER_DIR := $(LOCAL_PATH)/../generated +ANDROID_DIR := $(SRC_DIR)/build-android include $(CLEAR_VARS) LOCAL_MODULE := layer_utils @@ -37,8 +38,8 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ $(LAYER_DIR)/include \ $(SRC_DIR)/loader \ - $(SRC_DIR)/external/glslang \ - $(SRC_DIR)/external/spirv-tools/include + $(ANDROID_DIR)/external/glslang \ + $(ANDROID_DIR)/external/spirv-tools/include LOCAL_STATIC_LIBRARIES += layer_utils SPIRV-Tools-prebuilt LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden LOCAL_LDLIBS := -llog @@ -139,47 +140,47 @@ include $(BUILD_SHARED_LIBRARY) # Pull in prebuilt shaderc include $(CLEAR_VARS) LOCAL_MODULE := shaderc-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc.a +LOCAL_SRC_FILES := $(ANDROID_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)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libglslang.a +LOCAL_SRC_FILES := $(ANDROID_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)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOGLCompiler.a +LOCAL_SRC_FILES := $(ANDROID_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)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libOSDependent.a +LOCAL_SRC_FILES := $(ANDROID_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)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libHLSL.a +LOCAL_SRC_FILES := $(ANDROID_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)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libshaderc_util.a +LOCAL_SRC_FILES := $(ANDROID_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)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV.a +LOCAL_SRC_FILES := $(ANDROID_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)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools.a +LOCAL_SRC_FILES := $(ANDROID_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := SPIRV-Tools-opt-prebuilt -LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools-opt.a +LOCAL_SRC_FILES := $(ANDROID_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools-opt.a include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -194,7 +195,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/libs \ $(SRC_DIR)/common \ $(SRC_DIR)/icd/common \ - $(SRC_DIR)/external/shaderc/libshaderc/include + $(ANDROID_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 SPIRV-Tools-opt-prebuilt @@ -217,7 +218,7 @@ LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/libs \ $(SRC_DIR)/common \ $(SRC_DIR)/icd/common \ - $(SRC_DIR)/external/shaderc/libshaderc/include + $(ANDROID_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 SPIRV-Tools-opt-prebuilt diff --git a/build-android/update_external_sources_android.bat b/build-android/update_external_sources_android.bat index d160a30..2c771d7 100755 --- a/build-android/update_external_sources_android.bat +++ b/build-android/update_external_sources_android.bat @@ -21,7 +21,7 @@ REM setlocal EnableDelayedExpansion set errorCode=0 set ANDROID_BUILD_DIR=%~dp0 -set BUILD_DIR=%ANDROID_BUILD_DIR%.. +set BUILD_DIR=%ANDROID_BUILD_DIR% set BASE_DIR=%BUILD_DIR%\external set GLSLANG_DIR=%BASE_DIR%\glslang set SPIRV_TOOLS_DIR=%BASE_DIR%\spirv-tools diff --git a/build-android/update_external_sources_android.sh b/build-android/update_external_sources_android.sh index 8f90da6..53a5880 100755 --- a/build-android/update_external_sources_android.sh +++ b/build-android/update_external_sources_android.sh @@ -19,7 +19,7 @@ set -e ANDROIDBUILDDIR=$PWD -BUILDDIR=$ANDROIDBUILDDIR/.. +BUILDDIR=$ANDROIDBUILDDIR BASEDIR=$BUILDDIR/external GLSLANG_REVISION=$(cat $ANDROIDBUILDDIR/glslang_revision_android) -- 2.7.4