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

Commit 526ddfb1 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Revert "Check prebuilt sources during checkbuild""

parents 0f26c64e 409ea88c

core/main.mk

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

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 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
@@ -35,8 +38,6 @@ 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))