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

Commit 8449b88b authored by Ying Wang's avatar Ying Wang Committed by android-build-merger
Browse files

Merge "Disable .toc optimization for host modules." 

am: 7b92312e

* commit '7b92312e':
  Disable .toc optimization for host modules.
parents 0d4a0a9d 7b92312e

core/base_rules.mk

+4 −0
Original line number Diff line number Diff line
@@ -227,6 +227,9 @@ LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE) 
# dependent binaries of a .toc file will be rebuilt only when the content of

# the .toc file is changed.

###########################################################

ifndef LOCAL_IS_HOST_MODULE

# Disable .toc optimization for host modules: we may run the host binaries during the build process

# and the libraries' implementation matters.

ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)

LOCAL_INTERMEDIATE_TARGETS += $(LOCAL_BUILT_MODULE).toc

$(LOCAL_BUILT_MODULE).toc: $(LOCAL_BUILT_MODULE)
@@ -236,6 +239,7 @@ $(LOCAL_BUILT_MODULE).toc: $(LOCAL_BUILT_MODULE) 
# Kati adds restat=1 to ninja. GNU make does nothing for this.

.KATI_RESTAT: $(LOCAL_BUILT_MODULE).toc

endif

endif



###########################################################

## logtags: Add .logtags files to global list

core/binary.mk

+9 −3
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ built_shared_libraries := \ 
    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

      $(addsuffix $(so_suffix), \

        $(my_shared_libraries)))

built_shared_library_tocs := $(addsuffix .toc, $(built_shared_libraries))

built_shared_library_deps := $(addsuffix .toc, $(built_shared_libraries))



# Add the NDK libraries to the built module dependency

my_system_shared_libraries_fullpath := \
@@ -1216,7 +1216,13 @@ built_shared_libraries := \ 
    $(addprefix $($(LOCAL_2ND_ARCH_VAR_PREFIX)$(my_prefix)OUT_INTERMEDIATE_LIBRARIES)/, \

      $(addsuffix $(so_suffix), \

        $(installed_shared_library_module_names)))

built_shared_library_tocs := $(addsuffix .toc, $(built_shared_libraries))

ifdef LOCAL_IS_HOST_MODULE

# Disable .toc optimization for host modules: we may run the host binaries during the build process

# and the libraries' implementation matters.

built_shared_library_deps := $(built_shared_libraries)

else

built_shared_library_deps := $(addsuffix .toc, $(built_shared_libraries))

endif

my_system_shared_libraries_fullpath :=

endif
@@ -1312,7 +1318,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_OBJECTS := $(all_objects) 
###########################################################

# all_libraries is used for the dependencies on LOCAL_BUILT_MODULE.

all_libraries := \

    $(built_shared_library_tocs) \

    $(built_shared_library_deps) \

    $(my_system_shared_libraries_fullpath) \

    $(built_static_libraries) \

    $(built_whole_libraries)

core/dex_preopt_libart.mk

+0 −5
Original line number Diff line number Diff line
@@ -11,11 +11,6 @@ else 
DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX)

endif



# By default, do not run rerun dex2oat if the tool changes.

# Comment out the | to force dex2oat to rerun on after all changes.

DEX2OAT_DEPENDENCY := art/runtime/oat.cc # dependency on oat version number

DEX2OAT_DEPENDENCY += art/runtime/image.cc # dependency on image version number

DEX2OAT_DEPENDENCY += |

DEX2OAT_DEPENDENCY += $(DEX2OAT)



# Use the first preloaded-classes file in PRODUCT_COPY_FILES.