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

Commit a0158d83 authored by Jooyung Han's avatar Jooyung Han
Browse files

Use soong-generated vndk.libraries.txt 

check-vndk-list target should use 'filename's not 'modulename's.
But retrieving(or calculation) of filename from modulename doesn't work
when target module is not installed. That's why builds of some targets
fail given that libprotobuf-cpp-full's name is changed.

Now soong generates vndk.libraries.txt with filenames of VNDK libs.

And, check-vndk-list target is disabled now for targets with no vndk
libs. (BOARD_VNDK_VERSION is not set)

Bug: 142963962
Bug: 141019581
Test: m check-vndk-list
Test: lunch qemu_trusty_arm64-userdebug; m check-vndk-list (no check)
Change-Id: I680deb1a7af37c32a9e6932d52e8d87e5a3534b9
parent 0d07c944

target/product/gsi/Android.mk

+5 −14
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)



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

# Create the list of vndk libraries from the source code.

INTERNAL_VNDK_LIB_LIST := $(call intermediates-dir-for,PACKAGING,vndk)/libs.txt

$(INTERNAL_VNDK_LIB_LIST):

	@echo "Generate: $@"

	@mkdir -p $(dir $@)

	$(hide) echo -n > $@

	$(hide) $(foreach lib, $(filter-out libclang_rt.%,$(LLNDK_LIBRARIES)), \

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

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

	  echo VNDK-SP: $(lib).so >> $@;)

	$(hide) $(foreach lib, $(filter-out libclang_rt.%,$(VNDK_CORE_LIBRARIES)), \

	  echo VNDK-core: $(lib).so >> $@;)

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

	  echo VNDK-private: $(lib).so >> $@;)

# list of vndk libraries from the source code.

INTERNAL_VNDK_LIB_LIST := $(SOONG_OUT_DIR)/vndk/vndk.libraries.txt



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

# This is the up-to-date list of vndk libs.
@@ -49,6 +37,9 @@ else ifeq ($(TARGET_BUILD_PDK),true) 
check-vndk-list: ;

else ifeq ($(TARGET_SKIP_CURRENT_VNDK),true)

check-vndk-list: ;

else ifeq ($(BOARD_VNDK_VERSION),)

# b/143233626 do not check vndk-list when vndk libs are not built

check-vndk-list: ;

else

check-vndk-list: $(check-vndk-list-timestamp)

ifneq ($(SKIP_ABI_CHECKS),true)

target/product/gsi/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ VNDK-SP: android.hardware.graphics.mapper@2.1.so 
VNDK-SP: android.hardware.graphics.mapper@3.0.so

VNDK-SP: android.hardware.renderscript@1.0.so

VNDK-SP: android.hidl.memory.token@1.0.so

VNDK-SP: android.hidl.memory@1.0.so

VNDK-SP: android.hidl.memory@1.0-impl.so

VNDK-SP: android.hidl.memory@1.0.so

VNDK-SP: android.hidl.safe_union@1.0.so

VNDK-SP: libRSCpuRef.so

VNDK-SP: libRSDriver.so
@@ -161,8 +161,8 @@ VNDK-core: android.hardware.secure_element@1.0.so 
VNDK-core: android.hardware.secure_element@1.1.so

VNDK-core: android.hardware.sensors@1.0.so

VNDK-core: android.hardware.sensors@2.0.so

VNDK-core: android.hardware.soundtrigger@2.0.so

VNDK-core: android.hardware.soundtrigger@2.0-core.so

VNDK-core: android.hardware.soundtrigger@2.0.so

VNDK-core: android.hardware.soundtrigger@2.1.so

VNDK-core: android.hardware.soundtrigger@2.2.so

VNDK-core: android.hardware.tetheroffload.config@1.0.so
@@ -197,8 +197,8 @@ VNDK-core: android.hardware.wifi@1.2.so 
VNDK-core: android.hardware.wifi@1.3.so

VNDK-core: android.hidl.allocator@1.0.so

VNDK-core: android.hidl.memory.block@1.0.so

VNDK-core: android.hidl.token@1.0.so

VNDK-core: android.hidl.token@1.0-utils.so

VNDK-core: android.hidl.token@1.0.so

VNDK-core: android.system.net.netd@1.0.so

VNDK-core: android.system.net.netd@1.1.so

VNDK-core: android.system.suspend@1.0.so
@@ -242,8 +242,8 @@ VNDK-core: libpiex.so 
VNDK-core: libpng.so

VNDK-core: libpower.so

VNDK-core: libprocinfo.so

VNDK-core: libprotobuf-cpp-full.so

VNDK-core: libprotobuf-cpp-lite.so

VNDK-core: libprotobuf-cpp-full-3.9.1.so

VNDK-core: libprotobuf-cpp-lite-3.9.1.so

VNDK-core: libpuresoftkeymasterdevice.so

VNDK-core: libradio_metadata.so

VNDK-core: libselinux.so