commit a05dbdd6dc8357dd1eb2c0f46d00438917b183b8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 04 00:00:10 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 04 00:00:10 2019 +0000
tree 87dd50105ae3fe4a0fcf731aaabb239b201f95a3
parent 058ddaea8df154d873dac9ed3ccae1ba807445eb
parent 841ab06af1f7c8410596f3ea17e46b5c351f5b5c

Merge "Skip checking ELF files for uninstallable soong modules"

core/soong_cc_prebuilt.mk

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 679d5b8..31b0e63 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -96,9 +96,11 @@
 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