diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2024-03-28 12:37:04 +0900 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2024-03-28 12:37:04 +0900 |
| commit | 791caf183a5cd80e0b3140581708e8cc458b3e32 (patch) | |
| tree | ebd014f7d92a66f19de59feb149e17363755adc9 | |
| parent | b923abfb740799a0d966f1138183fe91e207ae5c (diff) | |
| download | libhidl-791caf183a5cd80e0b3140581708e8cc458b3e32.tar.gz | |
Remove VNDK related code from build.
Remove VNDK related code from VINTF build. This change will remove any
build code related with VNDK, which won't be triggered with VNDK
deprecation.
Bug: 330100430
Test: aosp_cf_x86_64_phone build succeeded
Change-Id: I225a1c5c51bd457c6bbbd60dc3ec58b6e60b3a25
| -rw-r--r-- | vintfdata/Android.mk | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/vintfdata/Android.mk b/vintfdata/Android.mk index 49e1733..0cd0d1f 100644 --- a/vintfdata/Android.mk +++ b/vintfdata/Android.mk @@ -32,15 +32,6 @@ ifdef SYSTEM_EXT_MANIFEST_FILES SYSTEM_EXT_MANIFEST_INPUT_FILES += $(SYSTEM_EXT_MANIFEST_FILES) endif -# VNDK Version in device compatibility matrix and framework manifest -ifeq ($(KEEP_VNDK),true) -ifeq ($(BOARD_VNDK_VERSION),current) -VINTF_VNDK_VERSION := $(PLATFORM_VNDK_VERSION) -else -VINTF_VNDK_VERSION := $(BOARD_VNDK_VERSION) -endif -endif - # Device Compatibility Matrix ifdef DEVICE_MATRIX_FILE DEVICE_MATRIX_INPUT_FILE := $(DEVICE_MATRIX_FILE) @@ -59,31 +50,13 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/vintf GEN := $(local-generated-sources-dir)/compatibility_matrix.xml -# VNDK is no longer a dependency for vendor version 35 and beyond -$(GEN): PRIVATE_VINTF_VNDK_VERSION := -ifdef VINTF_VNDK_VERSION -ifeq ($(call math_is_number,$(VINTF_VNDK_VERSION)),true) -ifeq ($(call math_lt_or_eq,$(VINTF_VNDK_VERSION),34),true) -$(GEN): PRIVATE_VINTF_VNDK_VERSION := $(VINTF_VNDK_VERSION) -endif -endif -endif $(GEN): PRIVATE_DEVICE_MATRIX_INPUT_FILE := $(DEVICE_MATRIX_INPUT_FILE) -ifeq ($(PRIVATE_VINTF_VNDK_VERSION),) $(GEN): $(DEVICE_MATRIX_INPUT_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf BOARD_SYSTEMSDK_VERSIONS="$(BOARD_SYSTEMSDK_VERSIONS)" \ $(HOST_OUT_EXECUTABLES)/assemble_vintf \ -i $(call normalize-path-list,$(PRIVATE_DEVICE_MATRIX_INPUT_FILE)) \ -o $@ -else -$(GEN): $(DEVICE_MATRIX_INPUT_FILE) $(HOST_OUT_EXECUTABLES)/assemble_vintf - REQUIRED_VNDK_VERSION=$(PRIVATE_VINTF_VNDK_VERSION) \ - BOARD_SYSTEMSDK_VERSIONS="$(BOARD_SYSTEMSDK_VERSIONS)" \ - $(HOST_OUT_EXECUTABLES)/assemble_vintf \ - -i $(call normalize-path-list,$(PRIVATE_DEVICE_MATRIX_INPUT_FILE)) \ - -o $@ -endif LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) @@ -145,7 +118,7 @@ LOCAL_MODULE_RELATIVE_PATH := vintf GEN := $(local-generated-sources-dir)/manifest.xml $(GEN): PRIVATE_SYSTEM_EXT_MANIFEST_FILES := $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(GEN): PRIVATE_PROVIDED_VNDK_VERSIONS := \ - $(sort $(VINTF_VNDK_VERSION) $(PRODUCT_EXTRA_VNDK_VERSIONS)) + $(sort $(PRODUCT_EXTRA_VNDK_VERSIONS)) $(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vintf PROVIDED_VNDK_VERSIONS="$(PRIVATE_PROVIDED_VNDK_VERSIONS)" \ @@ -156,7 +129,6 @@ $(GEN): $(SYSTEM_EXT_MANIFEST_INPUT_FILES) $(HOST_OUT_EXECUTABLES)/assemble_vint LOCAL_PREBUILT_MODULE_FILE := $(GEN) include $(BUILD_PREBUILT) -VINTF_VNDK_VERSION := SYSTEM_MANIFEST_INPUT_FILES := SYSTEM_EXT_MANIFEST_INPUT_FILES := DEVICE_MATRIX_INPUT_FILE := |