openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Revert "Check prebuilt sources during checkbuild"" 

am: 526ddfb172

Change-Id: I2bd28f5b35b27e2339eb2952b9e3acdd6a470773
This commit is contained in:
Colin Cross 2016-10-26 23:32:47 +00:00 committed by android-build-merger
parent 84ba353fd1 526ddfb172
commit 96fdb76947
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/main.mk
View File

@ -904,6 +904,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

5
core/prebuilt_internal.mk
View File

@ -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))