Commit 66bd7385 authored Oct 07, 2019 by Jooyung Han

Check if installable before installing unstripped

When LOCAL_UNINSTALLABLE_MODULE is true, the module is not installed.
But its unstripped output is installed to the path based on
my_module_path which is not set for it is not installable. Moreover,
my_module_path is not reset after use.

As a result, when LOCAL_UNINSTALLABLE_MODULE is true, the path for
unstripped output is unexpected.

The installation is guarded by LOCAL_UNINSTALLABLE_MODULE now,
which was LOCAL_VNDK_DEPEND_ON_CORE_VARIANT.

Test: m
Change-Id: If18cf76118e058a9e0701a8d66f7ff0f534e5881

parent 99d855db

core/soong_cc_prebuilt.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ endif

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