From 26335f89b1b25fd386adbc89edfcc600191b9e07 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 22 Aug 2017 10:25:18 +0900 Subject: [PATCH] add llndk|vndksp.libraries.txt to vndk_package List of llndk and vndk-sp libraries are written in the txt file so that they can be available at run-time. The information is used by libnativeloader to configure the classloader-namespace specially for vendor apks. Bug: 64882323 Test: build 2017 pixel devices. check that the two files exist on /system/etc. Change-Id: Ifbe339a5862f6ef57a8213a14a022765ccf77283 --- rootdir/Android.mk | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 3ddf9769e..6cfbe20d4 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -247,3 +247,45 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) LOCAL_MODULE_STEM := $(LOCAL_MODULE) include $(BUILD_PREBUILT) endif + +####################################### +# llndk.libraries.txt +include $(CLEAR_VARS) +LOCAL_MODULE := llndk.libraries.txt +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) +LOCAL_MODULE_STEM := $(LOCAL_MODULE) +include $(BUILD_SYSTEM)/base_rules.mk +llndk_md5 = $(word 1, $(shell echo $(LLNDK_LIBRARIES) | $(MD5SUM))) +llndk_dep = $(intermediates)/$(llndk_md5).dep +$(llndk_dep): + $(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.dep && touch $@ + +$(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES) +$(LOCAL_BUILT_MODULE): $(llndk_dep) + @echo "Generate: $@" + @mkdir -p $(dir $@) + $(hide) echo -n > $@ + $(hide) $(foreach lib,$(PRIVATE_LLNDK_LIBRARIES), \ + echo $(lib).so >> $@;) + +####################################### +# vndksp.libraries.txt +include $(CLEAR_VARS) +LOCAL_MODULE := vndksp.libraries.txt +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) +LOCAL_MODULE_STEM := $(LOCAL_MODULE) +include $(BUILD_SYSTEM)/base_rules.mk +vndksp_md5 = $(word 1, $(shell echo $(LLNDK_LIBRARIES) | $(MD5SUM))) +vndksp_dep = $(intermediates)/$(vndksp_md5).dep +$(vndksp_dep): + $(hide) mkdir -p $(dir $@) && rm -rf $(dir $@)*.dep && touch $@ + +$(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES) +$(LOCAL_BUILT_MODULE): $(vndksp_dep) + @echo "Generate: $@" + @mkdir -p $(dir $@) + $(hide) echo -n > $@ + $(hide) $(foreach lib,$(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES), \ + echo $(lib).so >> $@;)