tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "VNDK library list uses installed name" am: 885cf6b565

Browse source 
am: 4c0eae4f3f

Change-Id: I8a5b25f29618924830e9a3b855ef3a9489442731
This commit is contained in:
Yo Chiang 2019-10-23 12:07:16 -07:00 committed by android-build-merger
commit 4d797c1aaa
2 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
target/product/gsi/Android.mk
View file

@ -2,19 +2,37 @@ LOCAL_PATH:= $(call my-dir)
##################################################################### #####################################################################
# Create the list of vndk libraries from the source code. # Create the list of vndk libraries from the source code.
# 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
INTERNAL_VNDK_LIB_LIST := $(call intermediates-dir-for,PACKAGING,vndk)/libs.txt INTERNAL_VNDK_LIB_LIST := $(call intermediates-dir-for,PACKAGING,vndk)/libs.txt
$(INTERNAL_VNDK_LIB_LIST): PRIVATE_LLNDK_LIBRARIES := \
$(call module-installed-files-or-guess,$(filter-out libclang_rt.%,$(LLNDK_LIBRARIES)),)
$(INTERNAL_VNDK_LIB_LIST): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := \
$(call module-installed-files-or-guess,$(VNDK_SAMEPROCESS_LIBRARIES),.vendor)
$(INTERNAL_VNDK_LIB_LIST): PRIVATE_VNDK_CORE_LIBRARIES := \
$(call module-installed-files-or-guess,$(filter-out libclang_rt.%,$(VNDK_CORE_LIBRARIES)),.vendor)
$(INTERNAL_VNDK_LIB_LIST): PRIVATE_VNDK_PRIVATE_LIBRARIES := \
$(call module-installed-files-or-guess,$(VNDK_PRIVATE_LIBRARIES),.vendor)
$(INTERNAL_VNDK_LIB_LIST): $(INTERNAL_VNDK_LIB_LIST):
@echo "Generate: $@" @echo "Generate: $@"
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) echo -n > $@ $(hide) echo -n > $@
$(hide) $(foreach lib, $(filter-out libclang_rt.%,$(LLNDK_LIBRARIES)), \ $(hide) $(foreach lib, $(PRIVATE_LLNDK_LIBRARIES), \
echo LLNDK: $(lib).so >> $@;) echo LLNDK: $(lib) >> $@;)
$(hide) $(foreach lib, $(VNDK_SAMEPROCESS_LIBRARIES), \ $(hide) $(foreach lib, $(PRIVATE_VNDK_SAMEPROCESS_LIBRARIES), \
echo VNDK-SP: $(lib).so >> $@;) echo VNDK-SP: $(lib) >> $@;)
$(hide) $(foreach lib, $(filter-out libclang_rt.%,$(VNDK_CORE_LIBRARIES)), \ $(hide) $(foreach lib, $(PRIVATE_VNDK_CORE_LIBRARIES), \
echo VNDK-core: $(lib).so >> $@;) echo VNDK-core: $(lib) >> $@;)
$(hide) $(foreach lib, $(VNDK_PRIVATE_LIBRARIES), \ $(hide) $(foreach lib, $(PRIVATE_VNDK_PRIVATE_LIBRARIES), \
echo VNDK-private: $(lib).so >> $@;) echo VNDK-private: $(lib) >> $@;)
##################################################################### #####################################################################
# This is the up-to-date list of vndk libs. # This is the up-to-date list of vndk libs.

4
target/product/gsi/current.txt
View file

@ -241,8 +241,8 @@ VNDK-core: libpiex.so
VNDK-core: libpng.so VNDK-core: libpng.so
VNDK-core: libpower.so VNDK-core: libpower.so
VNDK-core: libprocinfo.so VNDK-core: libprocinfo.so
VNDK-core: libprotobuf-cpp-full.so VNDK-core: libprotobuf-cpp-full-3.9.1.so
VNDK-core: libprotobuf-cpp-lite.so VNDK-core: libprotobuf-cpp-lite-3.9.1.so
VNDK-core: libpuresoftkeymasterdevice.so VNDK-core: libpuresoftkeymasterdevice.so
VNDK-core: libradio_metadata.so VNDK-core: libradio_metadata.so
VNDK-core: libselinux.so VNDK-core: libselinux.so