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

Commit 9d81a043 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by android-build-merger
Browse files

Merge "Disable to build ld.config.txt with previous vndk version" am: 59a9cef6 

am: c467e46c

Change-Id: I66b869b8e1cc90bc2c139cf07956ac5dd7940d08
parents 807e4cca c467e46c

rootdir/Android.mk

+0 −29
Original line number Diff line number Diff line
@@ -260,35 +260,6 @@ include $(BUILD_PREBUILT) 


endif  # ifeq ($(_enforce_vndk_at_runtime),true)



# ld.config.txt for VNDK versions older than PLATFORM_VNDK_VERSION

# are built with the VNDK libraries lists under /prebuilts/vndk.

#

# ld.config.$(VER).txt is built and installed for all VNDK versions

# listed in PRODUCT_EXTRA_VNDK_VERSIONS.

#

# $(1): VNDK version

define build_versioned_ld_config

include $(CLEAR_VARS)

LOCAL_MODULE := ld.config.$(1).txt

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $$(LOCAL_MODULE)

include $(BUILD_SYSTEM)/base_rules.mk

ld_config_template := $(LOCAL_PATH)/etc/ld.config.txt

vndk_version := $(1)

lib_list_from_prebuilts := true

include $(LOCAL_PATH)/update_and_install_ld_config.mk

endef



vndk_snapshots := $(wildcard prebuilts/vndk/*)

supported_vndk_snapshot_versions := \

  $(strip $(patsubst prebuilts/vndk/v%,%,$(vndk_snapshots)))

$(foreach ver,$(supported_vndk_snapshot_versions),\

  $(eval $(call build_versioned_ld_config,$(ver))))



vndk_snapshots :=

supported_vndk_snapshot_versions :=



#######################################

# ld.config.vndk_lite.txt

#

rootdir/update_and_install_ld_config.mk

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ endif 


llndk_libraries_file := $(library_lists_dir)/llndk.libraries.$(vndk_version).txt

vndksp_libraries_file := $(library_lists_dir)/vndksp.libraries.$(vndk_version).txt

vndkcore_libraries_file := $(library_lists_dir)/vndkcore.libraries.txt

vndkprivate_libraries_file := $(library_lists_dir)/vndkprivate.libraries.txt

vndkcore_libraries_file := $(library_lists_dir)/vndkcore.libraries.$(vndk_version).txt

vndkprivate_libraries_file := $(library_lists_dir)/vndkprivate.libraries.$(vndk_version).txt

llndk_moved_to_apex_libraries_file := $(library_lists_dir)/llndkinapex.libraries.txt

ifeq ($(my_vndk_use_core_variant),true)

vndk_using_core_variant_libraries_file := $(library_lists_dir)/vndk_using_core_variant.libraries.$(vndk_version).txt