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

Commit 178129d1 authored by Kiyoung Kim's avatar Kiyoung Kim
Browse files

Add libraries txt file to build target 

Linkerconfig requires more libraries txt files to get library list
related variable values. To make this available from runtime, those
should be added as build target and included in system image.

Bug: 137511540
Test: m -j && tested from cuttlefish
Change-Id: Id3304eea5a7d8f2ffc171cd3b110b7d65e881f8c
parent b3fc1b74

rootdir/Android.mk

+56 −0
Original line number Diff line number Diff line
@@ -377,6 +377,62 @@ $(LOCAL_BUILT_MODULE): 
	$(hide) $(foreach lib,$(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES), \

		echo $(lib).so >> $@;)



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

# vndkcore.libraries.txt

include $(CLEAR_VARS)

LOCAL_MODULE := vndkcore.libraries.txt

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

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

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_CORE_LIBRARIES := $(VNDK_CORE_LIBRARIES)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

	$(hide) $(foreach lib,$(PRIVATE_VNDK_CORE_LIBRARIES), \

		echo $(lib).so >> $@;)



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

# vndkprivate.libraries.txt

include $(CLEAR_VARS)

LOCAL_MODULE := vndkprivate.libraries.txt

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

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

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_PRIVATE_LIBRARIES := $(VNDK_PRIVATE_LIBRARIES)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

	$(hide) $(foreach lib,$(PRIVATE_VNDK_PRIVATE_LIBRARIES), \

		echo $(lib).so >> $@;)



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

# sanitizer.libraries.txt

include $(CLEAR_VARS)

LOCAL_MODULE := sanitizer.libraries.txt

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)

LOCAL_MODULE_STEM := $(LOCAL_MODULE)

include $(BUILD_SYSTEM)/base_rules.mk

$(LOCAL_BUILT_MODULE): PRIVATE_SANITIZER_RUNTIME_LIBRARIES := $(addsuffix .so,\

  $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(HWADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(UBSAN_RUNTIME_LIBRARY) \

  $(TSAN_RUNTIME_LIBRARY) \

  $(2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(2ND_HWADDRESS_SANITIZER_RUNTIME_LIBRARY) \

  $(2ND_UBSAN_RUNTIME_LIBRARY) \

  $(2ND_TSAN_RUNTIME_LIBRARY))

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

	$(hide) $(foreach lib,$(PRIVATE_SANITIZER_RUNTIME_LIBRARIES), \

		echo $(lib) >> $@;)



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

# adb_debug.prop in debug ramdisk

include $(CLEAR_VARS)