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

Commit 4b45eab1 authored by Kiyoung Kim's avatar Kiyoung Kim Committed by Gerrit Code Review
Browse files

Merge "Find or guess installed libraries for VNDK library list"

parents c7ea8817 fce28386

rootdir/Android.mk

+17 −8
Original line number Diff line number Diff line
@@ -334,6 +334,15 @@ LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/system/etc 
LOCAL_MODULE_STEM := ld.config.txt

include $(BUILD_PREBUILT)



# Returns the unique installed basenames of a module, or module.so if there are

# none.  The guess is to handle cases like libc, where the module itself is

# marked uninstallable but a symlink is installed with the name libc.so.

# $(1): list of libraries

# $(2): suffix to to add to each library (not used for guess)

define module-installed-files-or-guess

$(foreach lib,$(1),$(or $(strip $(sort $(notdir $(call module-installed-files,$(lib)$(2))))),$(lib).so))

endef



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

# llndk.libraries.txt

include $(CLEAR_VARS)
@@ -342,13 +351,13 @@ 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_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES)

$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(call module-installed-files-or-guess,$(LLNDK_LIBRARIES),)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

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

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

		echo $(lib) >> $@;)



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

# vndksp.libraries.txt
@@ -358,13 +367,13 @@ 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_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES)

$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_SAMEPROCESS_LIBRARIES),.vendor)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

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

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

		echo $(lib) >> $@;)



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

# vndkcore.libraries.txt
@@ -374,13 +383,13 @@ 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): PRIVATE_VNDK_CORE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_CORE_LIBRARIES),.vendor)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

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

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

		echo $(lib) >> $@;)



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

# vndkprivate.libraries.txt
@@ -390,13 +399,13 @@ 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): PRIVATE_VNDK_PRIVATE_LIBRARIES := $(call module-installed-files-or-guess,$(VNDK_PRIVATE_LIBRARIES),.vendor)

$(LOCAL_BUILT_MODULE):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

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

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

		echo $(lib) >> $@;)



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

# sanitizer.libraries.txt