Merge "Replace dependencies from the Makefile to API imported modules" am: 12d4cbf027
Original change: https://android-review.googlesource.com/c/platform/build/+/2201280 Change-Id: I7e11fd7d3ac93287dfa0da6d57e7eb4d75141543 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1035,6 +1035,24 @@ ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS := \
|
|||||||
$(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS) \
|
$(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS) \
|
||||||
$(filter-out $(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS),$(my_supported_variant))
|
$(filter-out $(ALL_MODULES.$(my_register_name).SUPPORTED_VARIANTS),$(my_supported_variant))
|
||||||
|
|
||||||
|
##########################################################################
|
||||||
|
## When compiling against API imported module, use API import stub
|
||||||
|
## libraries.
|
||||||
|
##########################################################################
|
||||||
|
ifneq ($(LOCAL_USE_VNDK),)
|
||||||
|
ifneq ($(LOCAL_MODULE_MAKEFILE),$(SOONG_ANDROID_MK))
|
||||||
|
apiimport_postfix := .apiimport
|
||||||
|
ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)
|
||||||
|
apiimport_postfix := .apiimport.product
|
||||||
|
else
|
||||||
|
apiimport_postfix := .apiimport.vendor
|
||||||
|
endif
|
||||||
|
|
||||||
|
my_required_modules := $(foreach l,$(my_required_modules), \
|
||||||
|
$(if $(filter $(l), $(API_IMPORTED_SHARED_LIBRARIES)), $(l)$(apiimport_postfix), $(l)))
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
##########################################################################
|
##########################################################################
|
||||||
## When compiling against the VNDK, add the .vendor or .product suffix to
|
## When compiling against the VNDK, add the .vendor or .product suffix to
|
||||||
## required modules.
|
## required modules.
|
||||||
|
@@ -1145,6 +1145,28 @@ ifneq ($(filter hwaddress,$(my_sanitize)),)
|
|||||||
$(my_static_libraries),hwasan)
|
$(my_static_libraries),hwasan)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
###################################################################
|
||||||
|
## When compiling against API imported module, use API import stub
|
||||||
|
## libraries.
|
||||||
|
##################################################################
|
||||||
|
|
||||||
|
apiimport_postfix := .apiimport
|
||||||
|
|
||||||
|
ifneq ($(LOCAL_USE_VNDK),)
|
||||||
|
ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)
|
||||||
|
apiimport_postfix := .apiimport.product
|
||||||
|
else
|
||||||
|
apiimport_postfix := .apiimport.vendor
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
my_shared_libraries := $(foreach l,$(my_shared_libraries), \
|
||||||
|
$(if $(filter $(l), $(API_IMPORTED_SHARED_LIBRARIES)), $(l)$(apiimport_postfix), $(l)))
|
||||||
|
my_system_shared_libraries := $(foreach l,$(my_system_shared_libraries), \
|
||||||
|
$(if $(filter $(l), $(API_IMPORTED_SHARED_LIBRARIES)), $(l)$(apiimport_postfix), $(l)))
|
||||||
|
my_header_libraries := $(foreach l,$(my_header_libraries), \
|
||||||
|
$(if $(filter $(l), $(API_IMPORTED_HEADER_LIBRARIES)), $(l)$(apiimport_postfix), $(l)))
|
||||||
|
|
||||||
###########################################################
|
###########################################################
|
||||||
## When compiling against the VNDK, use LL-NDK libraries
|
## When compiling against the VNDK, use LL-NDK libraries
|
||||||
###########################################################
|
###########################################################
|
||||||
|
@@ -139,6 +139,27 @@ my_shared_libraries := $(strip \
|
|||||||
# my_shared_libraries).
|
# my_shared_libraries).
|
||||||
include $(BUILD_SYSTEM)/cxx_stl_setup.mk
|
include $(BUILD_SYSTEM)/cxx_stl_setup.mk
|
||||||
|
|
||||||
|
# When compiling against API imported module, use API import stub libraries.
|
||||||
|
apiimport_postfix := .apiimport
|
||||||
|
|
||||||
|
ifneq ($(LOCAL_USE_VNDK),)
|
||||||
|
ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)
|
||||||
|
apiimport_postfix := .apiimport.product
|
||||||
|
else
|
||||||
|
apiimport_postfix := .apiimport.vendor
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef my_shared_libraries
|
||||||
|
my_shared_libraries := $(foreach l,$(my_shared_libraries), \
|
||||||
|
$(if $(filter $(l), $(API_IMPORTED_SHARED_LIBRARIES)), $(l)$(apiimport_postfix), $(l)))
|
||||||
|
endif #my_shared_libraries
|
||||||
|
|
||||||
|
ifdef my_system_shared_libraries
|
||||||
|
my_system_shared_libraries := $(foreach l,$(my_system_shared_libraries), \
|
||||||
|
$(if $(filter $(l), $(API_IMPORTED_SHARED_LIBRARIES)), $(l)$(apiimport_postfix), $(l)))
|
||||||
|
endif #my_system_shared_libraries
|
||||||
|
|
||||||
ifdef my_shared_libraries
|
ifdef my_shared_libraries
|
||||||
ifdef LOCAL_USE_VNDK
|
ifdef LOCAL_USE_VNDK
|
||||||
ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)
|
ifeq ($(LOCAL_USE_VNDK_PRODUCT),true)
|
||||||
|
Reference in New Issue
Block a user