From 8795394f25b618946ae115216b4e81e92bfb6c10 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 20 Feb 2020 16:17:01 -0800 Subject: [PATCH] Touch same_vndk_variant.timestamp Fix uneccessary rebuilds on incremental builds by touching the same_vndk_variant.timestamp output file. Test: m && m Bug: 0 Change-Id: Ieb1b47f8a6cc406139c326a527041239fdb627d0 Merged-In: Ieb1b47f8a6cc406139c326a527041239fdb627d0 (cherry picked from commit c989ff3d7597883ee89660f21f95389ecb1207ce) --- core/soong_cc_prebuilt.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk index 190a7edba..785389060 100644 --- a/core/soong_cc_prebuilt.mk +++ b/core/soong_cc_prebuilt.mk @@ -128,10 +128,11 @@ ifeq ($(my_check_same_vndk_variants),true) $(same_vndk_variants_stamp): PRIVATE_TOOLS_PREFIX := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)TOOLS_PREFIX) $(same_vndk_variants_stamp): $(my_core_shared_lib) $(LOCAL_PREBUILT_MODULE_FILE) - $(call verify-vndk-libs-identical,\ - $(PRIVATE_CORE_VARIANT),\ - $(PRIVATE_VENDOR_VARIANT),\ - $(PRIVATE_TOOLS_PREFIX)) + $(call verify-vndk-libs-identical,\ + $(PRIVATE_CORE_VARIANT),\ + $(PRIVATE_VENDOR_VARIANT),\ + $(PRIVATE_TOOLS_PREFIX)) + touch $@ $(LOCAL_BUILT_MODULE): $(same_vndk_variants_stamp) endif