projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8b6e1d3)
bcmdhd: Fix android version check
authorPop Alexandru Radu <minealex2244@gmail.com>
Sat, 7 Apr 2018 08:22:02 +0000 (11:22 +0300)
committerStricted <info@stricted.net>
Thu, 11 Oct 2018 21:44:13 +0000 (23:44 +0200)
drivers/net/wireless/bcmdhd/Makefile patch | blob | blame | history
drivers/net/wireless/bcmdhd_1_77/Makefile patch | blob | blame | history

diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile
index cb8b2f1fd70a3df1d7a45004c5a6daa6b9a0049f..131bfbb188c655b5a902821b0516af4c22acedfd 100644 (file)
--- a/drivers/net/wireless/bcmdhd/Makefile
+++ b/drivers/net/wireless/bcmdhd/Makefile
@@ -147,23 +147,6 @@ DHDCFLAGS += -DDHD_DONOT_FORWARD_BCMEVENT_AS_NETWORK_PKT
 # Customer scan timeout setting
 DHDCFLAGS += -DCUSTOMER_SCAN_TIMEOUT_SETTING
 
-# Android Version Check from Platform source
-CANDIDATE_VERSION_PATH := ./../../build/core ../../../../../../build/core out
-FOUND_VERSION_PATH := $(foreach dir,$(CANDIDATE_VERSION_PATH), $(wildcard $(dir)/version_defaults.mk))
-FOUND_VERSION_PATH := $(word 1, $(FOUND_VERSION_PATH))
-ifeq ($(FOUND_VERSION_PATH),)
-$(warning Not found Android version file. Set None)
-else
-# Extract version string and get major number
-ANDROID_PLATFORM_VERSION := $(shell grep "PLATFORM_VERSION := " $(FOUND_VERSION_PATH) | cut -d "=" -f 2 | cut -d "." -f 1 | sed 's/ //g')
-$(warning Android Platform Version : $(ANDROID_PLATFORM_VERSION))
-# If Android version lower than 7(Nougat) => Use Legacy File path
-ifeq ($(shell expr $(ANDROID_PLATFORM_VERSION) \< 7),1)
-DHDCFLAGS += -DDHD_LEGACY_FILE_PATH
-$(warning Will be use Legacy file path)
-endif
-endif
-
 ##############################
 # Android Platform Definition
 ##############################
diff --git a/drivers/net/wireless/bcmdhd_1_77/Makefile b/drivers/net/wireless/bcmdhd_1_77/Makefile
index a1365a1b6d8b6c4f523db31ebb0a046895b1a655..f699aba0bfe4863254e31715c1f2700dcdd691f4 100644 (file)
--- a/drivers/net/wireless/bcmdhd_1_77/Makefile
+++ b/drivers/net/wireless/bcmdhd_1_77/Makefile
@@ -282,23 +282,6 @@ DHDCFLAGS += -DSUPPORT_TRIGGER_HANG_EVENT
 # Enable Checking Blob existence
 DHDCFLAGS += -DDHD_BLOB_EXISTENCE_CHECK
 
-# Android Version Check from Platform source
-CANDIDATE_VERSION_PATH := ./../../build/core ../../../../../../build/core out
-FOUND_VERSION_PATH := $(foreach dir,$(CANDIDATE_VERSION_PATH), $(wildcard $(dir)/version_defaults.mk))
-FOUND_VERSION_PATH := $(word 1, $(FOUND_VERSION_PATH))
-ifeq ($(FOUND_VERSION_PATH),)
-$(warning Not found Android version file. Set None)
-else
-# Extract version string and get major number
-ANDROID_PLATFORM_VERSION := $(shell grep "PLATFORM_VERSION := " $(FOUND_VERSION_PATH) | cut -d "=" -f 2 | cut -d "." -f 1 | sed 's/ //g')
-$(warning Android Platform Version : $(ANDROID_PLATFORM_VERSION))
-# If Android version lower than 7(Nougat) => Use Legacy File path
-ifeq ($(shell expr $(ANDROID_PLATFORM_VERSION) \< 7),1)
-DHDCFLAGS += -DDHD_LEGACY_FILE_PATH
-$(warning Will be use Legacy file path)
-endif
-endif
-
 ##############################
 # Android Platform Definition
 ##############################