p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Add check to ensure PLATFORM_VNDK_VERSION is set" 

am: 13349ed3c2

Change-Id: Ibae825f9cc56606a01905f1b7bae9778275c0064
This commit is contained in:
Jae Shin 2017-12-26 01:55:07 +00:00 committed by android-build-merger
parent 152a886de3 13349ed3c2
commit a085258968
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/tasks/vndk.mk
View File

@ -17,6 +17,9 @@ current_makefile := $(lastword $(MAKEFILE_LIST))
# BOARD_VNDK_VERSION must be set to 'current' in order to generate a VNDK snapshot. # BOARD_VNDK_VERSION must be set to 'current' in order to generate a VNDK snapshot.
ifeq ($(BOARD_VNDK_VERSION),current) ifeq ($(BOARD_VNDK_VERSION),current)
# PLATFORM_VNDK_VERSION must be set.
ifneq (,$(PLATFORM_VNDK_VERSION))
# 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.
@ -233,6 +236,15 @@ vndk_snapshot_dependencies :=
# vndk_snapshot_arch_2ND := # vndk_snapshot_arch_2ND :=
# endif # 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
endif # PLATFORM_VNDK_VERSION
else # BOARD_VNDK_VERSION is NOT set to 'current' else # BOARD_VNDK_VERSION is NOT set to 'current'
.PHONY: vndk .PHONY: vndk