commit 4dc0c25643e679f34451d0d25a006f1f1c1751db
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 07 23:56:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 07 23:56:05 2019 +0000
tree c4de188b101bf785ddc61131dc4413d2d1ba6f59
parent 7b1c49a70dcd8fa02e0be9136c2ad972119efdb4
parent 66bd7385d21f03117971fd00c17d7ad2db3da23f

Merge "Check if installable before installing unstripped"

core/soong_cc_prebuilt.mk

diff --git a/core/soong_cc_prebuilt.mk b/core/soong_cc_prebuilt.mk
index 09eb419..9e3f0d3 100644
--- a/core/soong_cc_prebuilt.mk
+++ b/core/soong_cc_prebuilt.mk
@@ -136,7 +136,7 @@
 
 ifndef LOCAL_IS_HOST_MODULE
   ifdef LOCAL_SOONG_UNSTRIPPED_BINARY
-    ifneq ($(LOCAL_VNDK_DEPEND_ON_CORE_VARIANT),true)
+    ifneq ($(LOCAL_UNINSTALLABLE_MODULE),true)
       my_symbol_path := $(if $(LOCAL_SOONG_SYMBOL_PATH),$(LOCAL_SOONG_SYMBOL_PATH),$(my_module_path))
       # Store a copy with symbols for symbolic debugging
       my_unstripped_path := $(TARGET_OUT_UNSTRIPPED)/$(patsubst $(PRODUCT_OUT)/%,%,$(my_symbol_path))