commit b90bd1c6f95a0f448abd4fa547355b014cb89463
author Colin Cross <ccross@android.com> Sun Oct 30 22:20:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sun Oct 30 22:20:53 2016 +0000
tree 3d2e380942aeb160020e22b9cc3a22a0d4421207
parent d3242b7ae662418cd89901ba462ee086c4d6c8b9
parent e402dd8bb81ed5f5d7b803ad090e23a89ee90db5

Merge "Revert "Revert "Check prebuilt sources during checkbuild""" am: 515f43bb6e
am: e402dd8bb8

Change-Id: I2f8ff970f777382b3e60c34268525ab139ee39f5

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 1067e95..4671601 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -904,7 +904,6 @@
 
 .PHONY: checkbuild
 checkbuild: $(modules_to_check) droid_targets
-checkbuild: checkbuild-soong
 
 ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT))
 droid: checkbuild

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index d4fb47a..d9f9ea8 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -16,9 +16,6 @@
 $(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 @@
   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))