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

Commit 4d281880 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not append VNDK version if VNDK is not used"

parents ea4c7d57 dd16301b

rootdir/Android.mk

+9 −11
Original line number Original line Diff line number Diff line
@@ -125,14 +125,12 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep) 
bcp_md5 :=

bcp_md5 :=

bcp_dep :=

bcp_dep :=





# If PLATFORM_VNDK_VERSION is defined and not "current", generate versioned

# If BOARD_VNDK_VERSION is defined, append PLATFORM_VNDK_VERSION to base name.

# module names for ld.config.txt, llndk.libraries.txt and vndksp.libraries.txt

define append_vndk_version

# files.

define versioned_module_name

$(strip \

$(strip \

  $(if $(filter-out current,$(PLATFORM_VNDK_VERSION)), \

  $(if $(BOARD_VNDK_VERSION), \

    $(basename $(LOCAL_MODULE)).$(PLATFORM_VNDK_VERSION)$(suffix $(LOCAL_MODULE)), \

    $(basename $(1)).$(PLATFORM_VNDK_VERSION)$(suffix $(1)), \

    $(LOCAL_MODULE) \

    $(1) \

  ) \

  ) \

)

)

endef

endef
@@ -153,7 +151,7 @@ ifeq ($(_enforce_vndk_at_runtime),true) 
LOCAL_MODULE := ld.config.txt

LOCAL_MODULE := ld.config.txt

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(call versioned_module_name)

LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))

include $(BUILD_SYSTEM)/base_rules.mk

include $(BUILD_SYSTEM)/base_rules.mk





llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\

llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\
@@ -200,7 +198,7 @@ else # if _enforce_vndk_at_runtime is not true 
LOCAL_MODULE := ld.config.txt

LOCAL_MODULE := ld.config.txt

ifeq ($(PRODUCT_TREBLE_LINKER_NAMESPACES)|$(SANITIZE_TARGET),true|)

ifeq ($(PRODUCT_TREBLE_LINKER_NAMESPACES)|$(SANITIZE_TARGET),true|)

  LOCAL_SRC_FILES := etc/ld.config.txt

  LOCAL_SRC_FILES := etc/ld.config.txt

  LOCAL_MODULE_STEM := $(call versioned_module_name)

  LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))

else

else

  LOCAL_SRC_FILES := etc/ld.config.legacy.txt

  LOCAL_SRC_FILES := etc/ld.config.legacy.txt

  LOCAL_MODULE_STEM := $(LOCAL_MODULE)

  LOCAL_MODULE_STEM := $(LOCAL_MODULE)
@@ -216,7 +214,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := llndk.libraries.txt

LOCAL_MODULE := llndk.libraries.txt

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(call versioned_module_name)

LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))

include $(BUILD_SYSTEM)/base_rules.mk

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES)

$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES)

$(LOCAL_BUILT_MODULE):

$(LOCAL_BUILT_MODULE):
@@ -232,7 +230,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := vndksp.libraries.txt

LOCAL_MODULE := vndksp.libraries.txt

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(call versioned_module_name)

LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE))

include $(BUILD_SYSTEM)/base_rules.mk

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES)

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES)

$(LOCAL_BUILT_MODULE):

$(LOCAL_BUILT_MODULE):