Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec8fae6f authored by Colin Cross's avatar Colin Cross
Browse files

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
parent fe3e1818

core/main.mk

+0 −1
Original line number Diff line number Diff line
@@ -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

core/prebuilt_internal.mk

+2 −3
Original line number Diff line number Diff line
@@ -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))