Revert "Check prebuilt sources during checkbuild"
This reverts commit ec8fae6f2e11a772fa97fe6baf895222f7ffdf5d.
Revert this until a few oddball branches can be fixed.
Bug: 32332829
Change-Id: Ic95fa50e36cb32a4d29bf765b1f3d8384140fb0b
diff --git a/core/main.mk b/core/main.mk
index 48a39d0..dabe093 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -903,6 +903,7 @@
.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 e333451..af59756 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -16,6 +16,9 @@
$(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 @@
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))