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

Commit 426b132b authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Revert "Revert "Check prebuilt sources during checkbuild""" am:... 

Merge "Revert "Revert "Check prebuilt sources during checkbuild""" am: 515f43bb am: e402dd8b am: b90bd1c6
am: 4f9a3618

Change-Id: I0c24e84a5c336dd6fc2c1cd2612c70a706a897b0
parents 43a8298b 4f9a3618

core/main.mk

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