StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix PDK dupbuild issues"

Browse Source
This commit is contained in:
Treehugger Robot
2016-12-10 07:14:11 +00:00
committed by Gerrit Code Review
parent 1b2de51881 e0bba6fa12
commit d1b10b20f6
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/base_rules.mk
View File

@@ -161,6 +161,7 @@ my_module_path := $(my_multilib_module_path)
else else
my_module_path := $(strip $(LOCAL_MODULE_PATH)) my_module_path := $(strip $(LOCAL_MODULE_PATH))
endif endif
my_module_path := $(patsubst %/,%,$(my_module_path))
my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH)) my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH))
ifeq ($(my_module_path),) ifeq ($(my_module_path),)
ifdef LOCAL_IS_HOST_MODULE ifdef LOCAL_IS_HOST_MODULE

10
core/notice_files.mk
View File

@@ -33,7 +33,7 @@ ifdef notice_file
# compliance. # compliance.
# Includes the leading slash # Includes the leading slash
ifdef LOCAL_INSTALLED_MODULE ifdef LOCAL_INSTALLED_MODULE
module_installed_filename := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE)) module_installed_filename := $(patsubst $(PRODUCT_OUT)/%,%,$(LOCAL_INSTALLED_MODULE))
else else
# This module isn't installable # This module isn't installable
ifeq ($(LOCAL_MODULE_CLASS),STATIC_LIBRARIES) ifeq ($(LOCAL_MODULE_CLASS),STATIC_LIBRARIES)
@@ -41,7 +41,7 @@ else
# We can't use xxx_OUT_STATIC_LIBRARIES because it points into # We can't use xxx_OUT_STATIC_LIBRARIES because it points into
# device-obj or host-obj. # device-obj or host-obj.
module_installed_filename := \ module_installed_filename := \
$(patsubst $(PRODUCT_OUT)%,%,$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_SHARED_LIBRARIES))/$(notdir $(LOCAL_BUILT_MODULE)) $(patsubst $(PRODUCT_OUT)/%,%,$($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_SHARED_LIBRARIES))/$(notdir $(LOCAL_BUILT_MODULE))
else else
ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES) ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)
# Stick the static java libraries with the regular java libraries. # Stick the static java libraries with the regular java libraries.
@@ -53,7 +53,7 @@ else
module_leaf := $(LOCAL_MODULE).jar module_leaf := $(LOCAL_MODULE).jar
endif endif
module_installed_filename := \ module_installed_filename := \
$(patsubst $(PRODUCT_OUT)%,%,$($(my_prefix)OUT_JAVA_LIBRARIES))/$(module_leaf) $(patsubst $(PRODUCT_OUT)/%,%,$($(my_prefix)OUT_JAVA_LIBRARIES))/$(module_leaf)
else else
$(error Cannot determine where to install NOTICE file for $(LOCAL_MODULE)) $(error Cannot determine where to install NOTICE file for $(LOCAL_MODULE))
endif # JAVA_LIBRARIES endif # JAVA_LIBRARIES
@@ -61,8 +61,8 @@ else
endif endif
# In case it's actually a host file # In case it's actually a host file
module_installed_filename := $(patsubst $(HOST_OUT)%,%,$(module_installed_filename)) module_installed_filename := $(patsubst $(HOST_OUT)/%,%,$(module_installed_filename))
module_installed_filename := $(patsubst $(HOST_CROSS_OUT)%,%,$(module_installed_filename)) module_installed_filename := $(patsubst $(HOST_CROSS_OUT)/%,%,$(module_installed_filename))
installed_notice_file := $($(my_prefix)OUT_NOTICE_FILES)/src/$(module_installed_filename).txt installed_notice_file := $($(my_prefix)OUT_NOTICE_FILES)/src/$(module_installed_filename).txt