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

Commit 4dff0c69 authored by Justin Yun's avatar Justin Yun
Browse files

BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot 

When generating VNDK snapshot, BOARD_VNDK_RUNTIME_DISABLE must not be
'true' to have correct ld.config.txt file.

Bug: 71349776
Test: lunch aosp_arm64_ab-user; make -j vndk dist
Change-Id: I20b14addb2f4a191134a1a9943e328566ca48424
parent 167fcc5c

core/tasks/vndk.mk

+14 −8
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ ifeq ($(BOARD_VNDK_VERSION),current) 
# PLATFORM_VNDK_VERSION must be set.

ifneq (,$(PLATFORM_VNDK_VERSION))



# BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'.

ifneq ($(BOARD_VNDK_RUNTIME_DISABLE),true)



# Returns arch-specific libclang_rt.ubsan* library name.

# Because VNDK_CORE_LIBRARIES includes all arch variants for libclang_rt.ubsan*

# libs, the arch-specific libs are selected separately.
@@ -239,20 +242,23 @@ vndk_snapshot_dependencies := 
# vndk_snapshot_arch_2ND :=

# endif



else # PLATFORM_VNDK_VERSION is NOT set



.PHONY: vndk

vndk:

	$(call echo-error,$(current_makefile),CANNOT generate VNDK snapshot. PLATFORM_VNDK_VERSION must be set.)

	exit 1

else # BOARD_VNDK_RUNTIME_DISABLE is set to 'true'

error_msg := "CANNOT generate VNDK snapshot. BOARD_VNDK_RUNTIME_DISABLE must not be set to 'true'."

endif # BOARD_VNDK_RUNTIME_DISABLE



else # PLATFORM_VNDK_VERSION is NOT set

error_msg := "CANNOT generate VNDK snapshot. PLATFORM_VNDK_VERSION must be set."

endif # PLATFORM_VNDK_VERSION



else # BOARD_VNDK_VERSION is NOT set to 'current'

error_msg := "CANNOT generate VNDK snapshot. BOARD_VNDK_VERSION must be set to 'current'."

endif # BOARD_VNDK_VERSION



ifneq (,$(error_msg))



.PHONY: vndk

vndk:

	$(call echo-error,$(current_makefile),CANNOT generate VNDK snapshot. BOARD_VNDK_VERSION must be set to 'current'.)

	$(call echo-error,$(current_makefile),$(error_msg))

	exit 1



endif # BOARD_VNDK_VERSION
 
endif