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

Commit 0302dc13 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Support arch specific variants of... 

Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS" into nyc-dev
parents cc52da8d b6eb8ddb

core/clear_vars.mk

+4 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ LOCAL_GENERATED_SOURCES_$(TARGET_ARCH):= 
LOCAL_REQUIRED_MODULES_$(TARGET_ARCH):=

LOCAL_CLANG_$(TARGET_ARCH):=

LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH):=

LOCAL_STRIP_MODULE_$(TARGET_ARCH):=

LOCAL_PACK_MODULE_RELOCATIONS_$(TARGET_ARCH):=

ifdef TARGET_2ND_ARCH

LOCAL_SRC_FILES_$(TARGET_2ND_ARCH):=

LOCAL_SRC_FILES_EXCLUDE_$(TARGET_2ND_ARCH):=
@@ -235,6 +237,8 @@ LOCAL_GENERATED_SOURCES_$(TARGET_2ND_ARCH):= 
LOCAL_REQUIRED_MODULES_$(TARGET_2ND_ARCH):=

LOCAL_CLANG_$(TARGET_2ND_ARCH):=

LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH):=

LOCAL_STRIP_MODULE_$(TARGET_2ND_ARCH):=

LOCAL_PACK_MODULE_RELOCATIONS_$(TARGET_2ND_ARCH):=

endif

LOCAL_SRC_FILES_$(HOST_ARCH):=

LOCAL_SRC_FILES_EXCLUDE_$(HOST_ARCH):=

core/dynamic_binary.mk

+6 −2
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ relocation_packer_output := $(intermediates)/PACKED/$(my_built_module_stem) 


my_pack_module_relocations := false

ifneq ($(DISABLE_RELOCATION_PACKER),true)

    my_pack_module_relocations := $(LOCAL_PACK_MODULE_RELOCATIONS)

    my_pack_module_relocations := $(firstword \

      $(LOCAL_PACK_MODULE_RELOCATIONS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \

      $(LOCAL_PACK_MODULE_RELOCATIONS))

endif



ifeq ($(my_pack_module_relocations),)
@@ -110,7 +112,9 @@ endif 
strip_input := $(symbolic_output)

strip_output := $(LOCAL_BUILT_MODULE)



my_strip_module := $(LOCAL_STRIP_MODULE)

my_strip_module := $(firstword \

  $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \

  $(LOCAL_STRIP_MODULE))

ifeq ($(my_strip_module),)

  my_strip_module := true

endif

core/prebuilt_internal.mk

+19 −9
Original line number Diff line number Diff line
@@ -38,22 +38,29 @@ else 
  endif

endif



my_strip_module := $(firstword \

  $(LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \

  $(LOCAL_STRIP_MODULE))

my_pack_module_relocations := $(firstword \

  $(LOCAL_PACK_MODULE_RELOCATIONS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) \

  $(LOCAL_PACK_MODULE_RELOCATIONS))



ifeq (SHARED_LIBRARIES,$(LOCAL_MODULE_CLASS))

  # Put the built targets of all shared libraries in a common directory

  # to simplify the link line.

  OVERRIDE_BUILT_MODULE_PATH := $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)

  ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_STRIP_MODULE),)

  ifeq ($(LOCAL_IS_HOST_MODULE)$(my_strip_module),)

    # Strip but not try to add debuglink

    LOCAL_STRIP_MODULE := no_debuglink

    my_strip_module := no_debuglink

  endif



  ifeq ($(LOCAL_IS_HOST_MODULE)$(LOCAL_PACK_MODULE_RELOCATIONS),)

  ifeq ($(LOCAL_IS_HOST_MODULE)$(my_pack_module_relocations),)

    # Do not pack relocations by default

    LOCAL_PACK_MODULE_RELOCATIONS := false

    my_pack_module_relocations := false

  endif



  ifeq ($(DISABLE_RELOCATION_PACKER),true)

    LOCAL_PACK_MODULE_RELOCATIONS := false

    my_pack_module_relocations := false

  endif

endif
@@ -75,7 +82,7 @@ LOCAL_BUILT_MODULE_STEM := package.apk 
LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk

endif



ifneq ($(filter true no_debuglink,$(LOCAL_STRIP_MODULE) $(LOCAL_PACK_MODULE_RELOCATIONS)),)

ifneq ($(filter true no_debuglink,$(my_strip_module) $(my_pack_module_relocations)),)

  ifdef LOCAL_IS_HOST_MODULE

    $(error Cannot strip/pack host module LOCAL_PATH=$(LOCAL_PATH))

  endif
@@ -85,10 +92,13 @@ ifneq ($(filter true no_debuglink,$(LOCAL_STRIP_MODULE) $(LOCAL_PACK_MODULE_RELO 
  ifneq ($(LOCAL_PREBUILT_STRIP_COMMENTS),)

    $(error Cannot strip/pack scripts LOCAL_PATH=$(LOCAL_PATH))

  endif

  # Set the arch-specific variables to set up the strip/pack rules.

  LOCAL_STRIP_MODULE_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) := $(my_strip_module)

  LOCAL_PACK_MODULE_RELOCATIONS_$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH) := $(my_pack_module_relocations)

  include $(BUILD_SYSTEM)/dynamic_binary.mk

  built_module := $(linked_module)



else  # LOCAL_STRIP_MODULE and LOCAL_PACK_MODULE_RELOCATIONS not true

else  # my_strip_module and my_pack_module_relocations not true

  include $(BUILD_SYSTEM)/base_rules.mk

  built_module := $(LOCAL_BUILT_MODULE)
@@ -130,8 +140,8 @@ endif 
endif



# We need to enclose the above export_includes and my_built_shared_libraries in

# "LOCAL_STRIP_MODULE not true" because otherwise the rules are defined in dynamic_binary.mk.

endif  # LOCAL_STRIP_MODULE not true

# "my_strip_module not true" because otherwise the rules are defined in dynamic_binary.mk.

endif  # my_strip_module not true



ifeq ($(LOCAL_MODULE_CLASS),APPS)

PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))