From ec8fae6f2e11a772fa97fe6baf895222f7ffdf5d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 21 Oct 2016 10:52:06 -0700 Subject: [PATCH] Check prebuilt sources during checkbuild Add prebuilt files as dependencies during checkbuild. This will flag prebuilt modules that have files that don't exist as errors, and also fix building soong modules with make native, etc. Bug: 32332829 Test: m -j checkbuild Test: m -j host Change-Id: Ia4e22cb640978c181de039202baf02f4fb5a94d5 --- core/main.mk | 1 - core/prebuilt_internal.mk | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index dabe0936fa..48a39d02d7 100644 --- a/core/main.mk +++ b/core/main.mk @@ -903,7 +903,6 @@ files: $(modules_to_install) \ .PHONY: checkbuild checkbuild: $(modules_to_check) droid_targets -checkbuild: checkbuild-soong ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT)) droid: checkbuild diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk index af59756266..e333451dc3 100644 --- a/core/prebuilt_internal.mk +++ b/core/prebuilt_internal.mk @@ -16,9 +16,6 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),) $(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) endif -# Not much sense to check build prebuilts -LOCAL_DONT_CHECK_MODULE := true - my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32) ifdef LOCAL_PREBUILT_MODULE_FILE @@ -38,6 +35,8 @@ else endif endif +LOCAL_CHECKED_MODULE := $(my_prebuilt_src_file) + my_strip_module := $(firstword \ $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \ $(LOCAL_STRIP_MODULE))