p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Check prebuilt sources during checkbuild" 

am: 0f26c64ef5

Change-Id: I961221a3e7cdcd00ea4dcbb1c88a36f138962113
This commit is contained in:
Colin Cross 2016-10-26 19:47:57 +00:00 committed by android-build-merger
parent 97f259ec41 0f26c64ef5
commit 84ba353fd1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/main.mk
View File

@ -904,7 +904,6 @@ files: $(modules_to_install) \
.PHONY: checkbuild .PHONY: checkbuild
checkbuild: $(modules_to_check) droid_targets checkbuild: $(modules_to_check) droid_targets
checkbuild: checkbuild-soong
ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT)) ifeq (true,$(ANDROID_BUILD_EVERYTHING_BY_DEFAULT))
droid: checkbuild droid: checkbuild

5
core/prebuilt_internal.mk
View File

@ -16,9 +16,6 @@ ifneq ($(LOCAL_PREBUILT_JAVA_LIBRARIES),)
$(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH)) $(error dont use LOCAL_PREBUILT_JAVA_LIBRARIES anymore LOCAL_PATH=$(LOCAL_PATH))
endif 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) my_32_64_bit_suffix := $(if $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)IS_64_BIT),64,32)
ifdef LOCAL_PREBUILT_MODULE_FILE ifdef LOCAL_PREBUILT_MODULE_FILE
@ -38,6 +35,8 @@ else
endif endif
endif endif
LOCAL_CHECKED_MODULE := $(my_prebuilt_src_file)
my_strip_module := $(firstword \ my_strip_module := $(firstword \
$(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \ $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \
$(LOCAL_STRIP_MODULE)) $(LOCAL_STRIP_MODULE))