From 8546cd77cf72411a810c84dea912d4d11a00b1c8 Mon Sep 17 00:00:00 2001 From: Zhipeng Wang Date: Tue, 26 Mar 2024 11:04:40 +0900 Subject: [PATCH] MA-22242 [Android-14] Fix build error when using bazel to update symbol list The following build error is encountered when using bazel to update symbol list: Makefile:142: /build/make/core/build_id.mk: No such file or directory make: *** No rule to make target '/build/make/core/build_id.mk'. Stop. There is no build_id.mk when using bazel build. the first letter of BUILD_ID in build/make/core/build_id.mk for Android14 must be U to represent Android14, so the change has no negative effect on the branch being used only for Android14. Change-Id: I6045f7fabe9d6b1767b4c830bf4041a7e70029ae Signed-off-by: Zhipeng Wang --- mxm_wifiex/wlan_src/Makefile | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/mxm_wifiex/wlan_src/Makefile b/mxm_wifiex/wlan_src/Makefile index 3ec5308..7b6ca47 100644 --- a/mxm_wifiex/wlan_src/Makefile +++ b/mxm_wifiex/wlan_src/Makefile @@ -139,20 +139,7 @@ CONFIG_ANDROID_KERNEL=y ifeq ($(ANDROID_PRODUCT_OUT),1) ccflags-y += -DANDROID_SDK_VERSION=$(ANDROID_SDK_VERSION) else -include $(ANDROID_BUILD_TOP)/build/make/core/build_id.mk -ifeq ($(shell echo "$(BUILD_ID)" | cut -c1),R) - ccflags-y += -DANDROID_SDK_VERSION=30 -else ifeq ($(shell echo "$(BUILD_ID)" | cut -c1),S) - ccflags-y += -DANDROID_SDK_VERSION=31 -else ifeq ($(shell echo "$(BUILD_ID)" | cut -c1),T) - ccflags-y += -DANDROID_SDK_VERSION=33 -else ifeq ($(shell echo "$(BUILD_ID)" | cut -c1),U) - ccflags-y += -DANDROID_SDK_VERSION=34 -else - # Default optimization or actions - ANDROID_SDK_VERSION := 0 - ccflags-y += -DANDROID_SDK_VERSION -endif +ccflags-y += -DANDROID_SDK_VERSION=34 endif endif endif