commit d113adb2c36feacc6e9d79ec9a25aa1cbbd79d01
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Nov 15 05:42:44 2019 +0000
committer android-build-prod (mdb) <android-build-team-robot@google.com> Fri Nov 15 05:42:44 2019 +0000
tree dc1780c773354473287eb7a100e2bebdcd539d52
parent f295c7c5fe817eb2313938a961eed8e9b401a70c
parent 003441ee9743b97a90ce73ed7a29f1a4c944b5c9

Merge cherrypicks of [1167933, 1167888] into ndk-release-r21

Change-Id: I28aeaaf04adf1441482a0dbfa05c770adbd5972e

Android.mk

diff --git a/Android.mk b/Android.mk
index 6b9b80f..0cad257 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,8 +28,6 @@
 
 define gen_libshaderc
 
-$(1)/libshaderc.a: $(SHADERC_HEADERS_IN_OUT_DIR)
-
 $(1)/combine.ar: $(addprefix $(1)/, $(ALL_LIBS))
 	@echo "create libshaderc_combined.a" > $(1)/combine.ar
 	$(foreach lib,$(ALL_LIBS),
@@ -59,4 +57,6 @@
 
 endef
 
+libshaderc_combined: $(SHADERC_HEADERS_IN_OUT_DIR)
+
 $(eval $(call gen_libshaderc,$(TARGET_OUT),$(TOOLCHAIN_PREFIX)))