StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BOARD_VNDK_RUNTIME_DISABLE must not be "true" for VNDK snapshot"

Browse Source 
am: fd3f4570fa

Change-Id: Ida0e970a53a38f0de7c1d07cf3e5b455160d1a97
This commit is contained in:
Justin Yun
2018-01-05 00:50:55 +00:00
committed by android-build-merger
parent e3f8cac48a fd3f4570fa
commit 4c4976b2d2
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/tasks/vndk.mk
View File

@@ -20,6 +20,9 @@ ifeq ($(BOARD_VNDK_VERSION),current)
# PLATFORM_VNDK_VERSION must be set. # PLATFORM_VNDK_VERSION must be set.
ifneq (,$(PLATFORM_VNDK_VERSION)) 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. # Returns arch-specific libclang_rt.ubsan* library name.
# Because VNDK_CORE_LIBRARIES includes all arch variants for libclang_rt.ubsan* # Because VNDK_CORE_LIBRARIES includes all arch variants for libclang_rt.ubsan*
# libs, the arch-specific libs are selected separately. # libs, the arch-specific libs are selected separately.
@@ -239,20 +242,23 @@ vndk_snapshot_dependencies :=
# vndk_snapshot_arch_2ND := # vndk_snapshot_arch_2ND :=
# endif # endif
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 else # PLATFORM_VNDK_VERSION is NOT set
error_msg := "CANNOT generate VNDK snapshot. PLATFORM_VNDK_VERSION must be set."
.PHONY: vndk
vndk:
$(call echo-error,$(current_makefile),CANNOT generate VNDK snapshot. PLATFORM_VNDK_VERSION must be set.)
exit 1
endif # PLATFORM_VNDK_VERSION endif # PLATFORM_VNDK_VERSION
else # BOARD_VNDK_VERSION is NOT set to 'current' 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 .PHONY: vndk
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 exit 1
endif # BOARD_VNDK_VERSION endif