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

Merge "Check conformity of VNDK version"

Browse Source
This commit is contained in:
Treehugger Robot
2017-12-05 01:24:54 +00:00
committed by Gerrit Code Review
parent 531ce804ea 9272ef87a6
commit 6125d749ab
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/envsetup.mk
View File

@@ -285,9 +285,14 @@ ifeq ($(AB_OTA_UPDATER),true)
endif endif
# Check BOARD_VNDK_VERSION # Check BOARD_VNDK_VERSION
define check_vndk_version
$(eval vndk_path := prebuilts/vndk/v$(1)) \
$(if $(wildcard $(vndk_path)/Android.bp),,$(error VNDK version $(1) not found))
endef
ifdef BOARD_VNDK_VERSION ifdef BOARD_VNDK_VERSION
ifneq ($(BOARD_VNDK_VERSION),current) ifneq ($(BOARD_VNDK_VERSION),current)
$(error BOARD_VNDK_VERSION: Only "current" is implemented) $(call check_vndk_version,$(BOARD_VNDK_VERSION))
endif endif
TARGET_VENDOR_TEST_SUFFIX := /vendor TARGET_VENDOR_TEST_SUFFIX := /vendor
@@ -295,6 +300,10 @@ else
TARGET_VENDOR_TEST_SUFFIX := TARGET_VENDOR_TEST_SUFFIX :=
endif endif
ifdef PRODUCT_EXTRA_VNDK_VERSIONS
$(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))
endif
# --------------------------------------------------------------- # ---------------------------------------------------------------
# Set up configuration for target machine. # Set up configuration for target machine.
# The following must be set: # The following must be set:

1
core/soong_config.mk
View File

@@ -112,6 +112,7 @@ $(call add_json_list, DeviceKernelHeaders, $(TARGET_PROJECT_SYSTEM
$(call add_json_bool, DevicePrefer32BitExecutables, $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES))) $(call add_json_bool, DevicePrefer32BitExecutables, $(filter true,$(TARGET_PREFER_32_BIT_EXECUTABLES)))
$(call add_json_val, DeviceUsesClang, $(if $(USE_CLANG_PLATFORM_BUILD),$(USE_CLANG_PLATFORM_BUILD),false)) $(call add_json_val, DeviceUsesClang, $(if $(USE_CLANG_PLATFORM_BUILD),$(USE_CLANG_PLATFORM_BUILD),false))
$(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION)) $(call add_json_str, DeviceVndkVersion, $(BOARD_VNDK_VERSION))
$(call add_json_list, ExtraVndkVersions, $(PRODUCT_EXTRA_VNDK_VERSIONS))
$(call add_json_bool, Malloc_not_svelte, $(call invert_bool,$(filter true,$(MALLOC_SVELTE)))) $(call add_json_bool, Malloc_not_svelte, $(call invert_bool,$(filter true,$(MALLOC_SVELTE))))
$(call add_json_str, Override_rs_driver, $(OVERRIDE_RS_DRIVER)) $(call add_json_str, Override_rs_driver, $(OVERRIDE_RS_DRIVER))
$(call add_json_bool, Treble, $(filter true,$(PRODUCT_FULL_TREBLE))) $(call add_json_bool, Treble, $(filter true,$(PRODUCT_FULL_TREBLE)))

15
target/product/vndk/Android.mk
View File

@@ -96,7 +96,7 @@ endif
@chmod a+x $@ @chmod a+x $@
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := vndk_package LOCAL_MODULE := vndk_current
LOCAL_REQUIRED_MODULES := \ LOCAL_REQUIRED_MODULES := \
$(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_CORE_LIBRARIES)) \
$(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \ $(addsuffix .vendor,$(VNDK_SAMEPROCESS_LIBRARIES)) \
@@ -105,4 +105,17 @@ LOCAL_REQUIRED_MODULES := \
vndksp.libraries.txt vndksp.libraries.txt
include $(BUILD_PHONY_PACKAGE) include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS)
LOCAL_MODULE := vndk_package
ifeq (current,$(BOARD_VNDK_VERSION))
LOCAL_REQUIRED_MODULES := \
vndk_current
else
LOCAL_REQUIRED_MODULES := \
vndk_v$(BOARD_VNDK_VERSION)
endif
LOCAL_REQUIRED_MODULES += \
$(foreach vndk_ver,$(PRODUCT_EXTRA_VNDK_VERSIONS),vndk_v$(vndk_ver))
include $(BUILD_PHONY_PACKAGE)
endif # BOARD_VNDK_VERSION is set endif # BOARD_VNDK_VERSION is set