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

Commit 5f3b3689 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"

parents 7b049f71 ff1c3f2b

core/binary.mk

+9 −0
Original line number Diff line number Diff line
@@ -1411,9 +1411,18 @@ $(LOCAL_INSTALLED_MODULE): | $(installed_static_library_notice_file_targets) 
###########################################################

export_includes := $(intermediates)/export_includes

$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(my_export_c_include_dirs)

# Headers exported by whole static libraries are also exported by this library.

export_include_deps := $(strip \

   $(foreach l,$(my_whole_static_libraries), \

     $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes))

# Re-export requested headers from shared libraries.

export_include_deps += $(strip \

   $(foreach l,$(LOCAL_EXPORT_SHARED_LIBRARY_HEADERS), \

     $(call intermediates-dir-for,SHARED_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes))

# Re-export requested headers from static libraries.

export_include_deps += $(strip \

   $(foreach l,$(LOCAL_EXPORT_STATIC_LIBRARY_HEADERS), \

     $(call intermediates-dir-for,STATIC_LIBRARIES,$(l),$(LOCAL_IS_HOST_MODULE),,$(LOCAL_2ND_ARCH_VAR_PREFIX),$(my_host_cross))/export_includes))

$(export_includes): PRIVATE_REEXPORTED_INCLUDES := $(export_include_deps)

# Make sure .pb.h are already generated before any dependent source files get compiled.

# Similarly, the generated DBus headers need to exist before we export their location.

core/clear_vars.mk

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ LOCAL_STATIC_LIBRARIES:= 
# Group static libraries with "-Wl,--start-group" and "-Wl,--end-group" when linking.

LOCAL_GROUP_STATIC_LIBRARIES:=

LOCAL_WHOLE_STATIC_LIBRARIES:=

LOCAL_EXPORT_SHARED_LIBRARY_HEADERS:=

LOCAL_EXPORT_STATIC_LIBRARY_HEADERS:=

LOCAL_SHARED_LIBRARIES:=

LOCAL_IS_HOST_MODULE:=

LOCAL_CC:=