diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 23:45:50 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 23:45:50 +0000 |
| commit | 5c06f692b3baa81ba782e9a6dbf46cdf3be10667 (patch) | |
| tree | 10c504b8d9ce09c80dee134d5c643492bed65fca | |
| parent | 259e31da4b0412306055104ca47a92495113f4ba (diff) | |
| parent | 0fc7212e96876e023159b609cc75a8636ea2cdc2 (diff) | |
| download | shaderc-ndk-release-r23.tar.gz | |
Merge cherrypicks of [2072337] into ndk-release-r23.ndk-r23cndk-release-r23
Change-Id: Icf09505ac8c940a2db02ba44e99fc98a90641e99
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | kokoro/ndk-build/build.sh | 24 |
2 files changed, 19 insertions, 11 deletions
@@ -52,8 +52,8 @@ $(1)/combine.ar: $(addprefix $(1)/, $(ALL_LIBS)) $(1)/libshaderc_combined.a: $(addprefix $(1)/, $(ALL_LIBS)) $(1)/combine.ar @echo "[$(TARGET_ARCH_ABI)] Combine: libshaderc_combined.a <= $(ALL_LIBS)" - @cd $(1) && $(2)ar -M < combine.ar && cd $(ROOT_SHADERC_PATH) - @$(2)objcopy --strip-debug $(1)/libshaderc_combined.a + @cd $(1) && $(TARGET_AR) -M < combine.ar && cd $(ROOT_SHADERC_PATH) + @$(TARGET_STRIP) --strip-debug $(1)/libshaderc_combined.a $(NDK_APP_LIBS_OUT)/$(APP_STL)/$(TARGET_ARCH_ABI)/libshaderc.a: \ $(1)/libshaderc_combined.a @@ -73,4 +73,4 @@ endef libshaderc_combined: $(SHADERC_HEADERS_IN_OUT_DIR) -$(eval $(call gen_libshaderc,$(TARGET_OUT),$(TOOLCHAIN_PREFIX))) +$(eval $(call gen_libshaderc,$(TARGET_OUT))) diff --git a/kokoro/ndk-build/build.sh b/kokoro/ndk-build/build.sh index edf361c..0b9e124 100644 --- a/kokoro/ndk-build/build.sh +++ b/kokoro/ndk-build/build.sh @@ -44,13 +44,21 @@ cd $SRC/build # Invoke the build. BUILD_SHA=${KOKORO_GITHUB_COMMIT:-$KOKORO_GITHUB_PULL_REQUEST_COMMIT} -echo $(date): Starting ndk-build ... -$ANDROID_NDK/ndk-build \ - -C $SRC/android_test \ - NDK_APP_OUT=`pwd` \ - V=1 \ - SPVTOOLS_LOCAL_PATH=$SRC/third_party/spirv-tools \ - SPVHEADERS_LOCAL_PATH=$SRC/third_party/spirv-headers \ - -j 8 + +function do_ndk_build () { + echo $(date): Starting ndk-build $@... + $ANDROID_NDK/ndk-build \ + -C $SRC/android_test \ + NDK_APP_OUT=`pwd` \ + V=1 \ + SPVTOOLS_LOCAL_PATH=$SRC/third_party/spirv-tools \ + SPVHEADERS_LOCAL_PATH=$SRC/third_party/spirv-headers \ + -j 8 $@ +} + +do_ndk_build + +# Check that libshaderc_combined builds +do_ndk_build libshaderc_combined echo $(date): ndk-build completed. |