StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "make libprotobuf-cpp-* libs VNDK"

Browse Source 
am: cd46573189

Change-Id: I2504dae4a287bc4ac1269229dca1cf7e4902c037
This commit is contained in:
Jiyong Park
2017-04-21 07:50:59 +00:00
committed by android-build-merger
parent 901e5ac899 cd46573189
commit e56c17d779
1 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
core/binary.mk
View File

@@ -514,37 +514,6 @@ endif
########################################################### ###########################################################
my_asflags += -D__ASSEMBLY__ my_asflags += -D__ASSEMBLY__
###########################################################
## When compiling against the VNDK, use LL-NDK libraries
###########################################################
ifneq ($(LOCAL_USE_VNDK),)
####################################################
## Soong modules may be built twice, once for /system
## and once for /vendor. If we're using the VNDK,
## switch all soong libraries over to the /vendor
## variant.
####################################################
ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
# Soong-built libraries should always use the .vendor variant
my_whole_static_libraries := $(addsuffix .vendor,$(my_whole_static_libraries))
my_static_libraries := $(addsuffix .vendor,$(my_static_libraries))
my_shared_libraries := $(addsuffix .vendor,$(my_shared_libraries))
my_system_shared_libraries := $(addsuffix .vendor,$(my_system_shared_libraries))
my_header_libraries := $(addsuffix .vendor,$(my_header_libraries))
else
my_whole_static_libraries := $(foreach l,$(my_whole_static_libraries),\
$(if $(SPLIT_VENDOR.STATIC_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_static_libraries := $(foreach l,$(my_static_libraries),\
$(if $(SPLIT_VENDOR.STATIC_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_shared_libraries := $(foreach l,$(my_shared_libraries),\
$(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_system_shared_libraries := $(foreach l,$(my_system_shared_libraries),\
$(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_header_libraries := $(foreach l,$(my_header_libraries),\
$(if $(SPLIT_VENDOR.HEADER_LIBRARIES.$(l)),$(l).vendor,$(l)))
endif
endif
########################################################### ###########################################################
## Define PRIVATE_ variables from global vars ## Define PRIVATE_ variables from global vars
########################################################### ###########################################################
@@ -1343,6 +1312,36 @@ $(call track-src-file-obj,$(asm_sources_asm),$(asm_objects_asm))
asm_objects += $(asm_objects_asm) asm_objects += $(asm_objects_asm)
endif endif
###########################################################
## When compiling against the VNDK, use LL-NDK libraries
###########################################################
ifneq ($(LOCAL_USE_VNDK),)
####################################################
## Soong modules may be built twice, once for /system
## and once for /vendor. If we're using the VNDK,
## switch all soong libraries over to the /vendor
## variant.
####################################################
ifeq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
# Soong-built libraries should always use the .vendor variant
my_whole_static_libraries := $(addsuffix .vendor,$(my_whole_static_libraries))
my_static_libraries := $(addsuffix .vendor,$(my_static_libraries))
my_shared_libraries := $(addsuffix .vendor,$(my_shared_libraries))
my_system_shared_libraries := $(addsuffix .vendor,$(my_system_shared_libraries))
my_header_libraries := $(addsuffix .vendor,$(my_header_libraries))
else
my_whole_static_libraries := $(foreach l,$(my_whole_static_libraries),\
$(if $(SPLIT_VENDOR.STATIC_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_static_libraries := $(foreach l,$(my_static_libraries),\
$(if $(SPLIT_VENDOR.STATIC_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_shared_libraries := $(foreach l,$(my_shared_libraries),\
$(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_system_shared_libraries := $(foreach l,$(my_system_shared_libraries),\
$(if $(SPLIT_VENDOR.SHARED_LIBRARIES.$(l)),$(l).vendor,$(l)))
my_header_libraries := $(foreach l,$(my_header_libraries),\
$(if $(SPLIT_VENDOR.HEADER_LIBRARIES.$(l)),$(l).vendor,$(l)))
endif
endif
########################################################## ##########################################################
## Set up installed module dependency ## Set up installed module dependency