Merge "Skip checking ELF files for uninstallable soong modules"

am: a05dbdd6dc

Change-Id: I2db5cafaf94c6a830b506a502e53455bb67eceff
This commit is contained in:
Vic Yang 2019-04-03 18:35:28 -07:00 committed by android-build-merger
commit 3d8e554308
1 changed files with 5 additions and 3 deletions

View File

@ -96,9 +96,11 @@ ifdef LOCAL_USE_VNDK
endif
# Check prebuilt ELF binaries.
ifneq ($(LOCAL_CHECK_ELF_FILES),)
my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE)
include $(BUILD_SYSTEM)/check_elf_file.mk
ifdef LOCAL_INSTALLED_MODULE
ifneq ($(LOCAL_CHECK_ELF_FILES),)
my_prebuilt_src_file := $(LOCAL_PREBUILT_MODULE_FILE)
include $(BUILD_SYSTEM)/check_elf_file.mk
endif
endif
# The real dependency will be added after all Android.mks are loaded and the install paths