openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 0c9c0bfc: am 9aadde67: Merge "Include in upper-level makefiles" 

* commit '0c9c0bfcc6f2d10fa7235f48b0174a1a120ca599':
  Include $(BUILD_COPY_HEADERS) in upper-level makefiles
This commit is contained in:
Ying Wang 2014-02-21 04:19:45 +00:00 committed by Android Git Automerger
parent 039107aa8d 0c9c0bfcc6
commit 28edfe16f7
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/binary.mk
View File

@ -719,12 +719,6 @@ $(normal_objects) : | $(my_generated_sources)
$(all_objects) : | $(import_includes)
ALL_C_CPP_ETC_OBJECTS += $(all_objects)
###########################################################
## Copy headers to the install tree
###########################################################
ifndef LOCAL_2ND_ARCH_VAR_PREFIX
include $(BUILD_COPY_HEADERS)
endif
###########################################################
# Standard library handling.

5
core/host_shared_library.mk
View File

@ -44,3 +44,8 @@ $(LOCAL_BUILT_MODULE): $(all_objects) $(all_libraries) $(LOCAL_ADDITIONAL_DEPEND
$(transform-host-o-to-shared-lib)
endif # skip_build_from_source
###########################################################
## Copy headers to the install tree
###########################################################
include $(BUILD_COPY_HEADERS)

5
core/host_static_library.mk
View File

@ -25,3 +25,8 @@ include $(BUILD_SYSTEM)/binary.mk
$(LOCAL_BUILT_MODULE): $(built_whole_libraries)
$(LOCAL_BUILT_MODULE): $(all_objects)
$(transform-host-o-to-static-lib)
###########################################################
## Copy headers to the install tree
###########################################################
include $(BUILD_COPY_HEADERS)

5
core/shared_library.mk
View File

@ -41,3 +41,8 @@ LOCAL_2ND_ARCH_VAR_PREFIX :=
endif # TARGET_2ND_ARCH
my_module_arch_supported :=
###########################################################
## Copy headers to the install tree
###########################################################
include $(BUILD_COPY_HEADERS)

5
core/static_library.mk
View File

@ -29,3 +29,8 @@ LOCAL_2ND_ARCH_VAR_PREFIX :=
endif # TARGET_2ND_ARCH
my_module_arch_supported :=
###########################################################
## Copy headers to the install tree
###########################################################
include $(BUILD_COPY_HEADERS)