Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13a820d7 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix PDK dupbuild issues" am: d1b10b20 

am: 22c01a60

Change-Id: I2f1d5e204fb68d22de862f5806ace01c44c8da5d
parents 1b827f8f 22c01a60

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -161,6 +161,7 @@ my_module_path := $(my_multilib_module_path) 
else

my_module_path := $(strip $(LOCAL_MODULE_PATH))

endif

my_module_path := $(patsubst %/,%,$(my_module_path))

my_module_relative_path := $(strip $(LOCAL_MODULE_RELATIVE_PATH))

ifeq ($(my_module_path),)

  ifdef LOCAL_IS_HOST_MODULE

core/notice_files.mk

+5 −5
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ifdef notice_file 
# compliance.

# Includes the leading slash

ifdef LOCAL_INSTALLED_MODULE

  module_installed_filename := $(patsubst $(PRODUCT_OUT)%,%,$(LOCAL_INSTALLED_MODULE))

  module_installed_filename := $(patsubst $(PRODUCT_OUT)/%,%,$(LOCAL_INSTALLED_MODULE))

else

  # This module isn't installable

  ifeq ($(LOCAL_MODULE_CLASS),STATIC_LIBRARIES)
@@ -41,7 +41,7 @@ else 
    # We can't use xxx_OUT_STATIC_LIBRARIES because it points into

    # device-obj or host-obj.

    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

    ifeq ($(LOCAL_MODULE_CLASS),JAVA_LIBRARIES)

      # Stick the static java libraries with the regular java libraries.
@@ -53,7 +53,7 @@ else 
        module_leaf := $(LOCAL_MODULE).jar

      endif

      module_installed_filename := \

          $(patsubst $(PRODUCT_OUT)%,%,$($(my_prefix)OUT_JAVA_LIBRARIES))/$(module_leaf)

          $(patsubst $(PRODUCT_OUT)/%,%,$($(my_prefix)OUT_JAVA_LIBRARIES))/$(module_leaf)

    else

      $(error Cannot determine where to install NOTICE file for $(LOCAL_MODULE))

    endif # JAVA_LIBRARIES
@@ -61,8 +61,8 @@ else 
endif



# In case it's actually a host file

module_installed_filename := $(patsubst $(HOST_OUT)%,%,$(module_installed_filename))

module_installed_filename := $(patsubst $(HOST_CROSS_OUT)%,%,$(module_installed_filename))

module_installed_filename := $(patsubst $(HOST_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