aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2021-05-13 14:39:30 -0700
committerColin Cross <ccross@android.com>2021-05-13 14:41:16 -0700
commit16a7e63927da7b27abb4b2f784538a38799366f8 (patch)
treeb06cf41caaaab8014b316836c4545d298572f42a
parent9911cb3d65b530ec79ccb003fdec8f0b253b29eb (diff)
downloadandroid-nn-driver-16a7e63927da7b27abb4b2f784538a38799366f8.tar.gz
Remove autodetection of platform version
Hardcode the platform to S or later, we know we are building on at least S and the autodetection fails and requires updating for every new platform version. Bug: 186121492 Test: builds with PLATFORM_VERSION := T Change-Id: I1c3b29e0fc56dde4b220e651b35e024dba17c83a
-rw-r--r--Android.mk39
1 files changed, 0 insertions, 39 deletions
diff --git a/Android.mk b/Android.mk
index edde98c..06c653d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,49 +6,10 @@
ANDROID_NN_DRIVER_LOCAL_PATH := $(call my-dir)
LOCAL_PATH := $(ANDROID_NN_DRIVER_LOCAL_PATH)
-P_OR_LATER := 0
-Q_OR_LATER := 0
-R_OR_LATER := 0
-S_OR_LATER := 0
-
-ifeq ($(PLATFORM_VERSION),9)
-P_OR_LATER := 1
-endif # PLATFORM_VERSION == 9
-ifeq ($(PLATFORM_VERSION),P)
-P_OR_LATER := 1
-endif # PLATFORM_VERSION == P
-
-ifeq ($(PLATFORM_VERSION),10)
-P_OR_LATER := 1
-Q_OR_LATER := 1
-endif # PLATFORM_VERSION == 10
-ifeq ($(PLATFORM_VERSION),Q)
-P_OR_LATER := 1
-Q_OR_LATER := 1
-endif # PLATFORM_VERSION == Q
-ifeq ($(PLATFORM_VERSION),R)
-P_OR_LATER := 1
-Q_OR_LATER := 1
-R_OR_LATER := 1
-endif # PLATFORM_VERSION == R
-ifeq ($(PLATFORM_VERSION),S)
P_OR_LATER := 1
Q_OR_LATER := 1
R_OR_LATER := 1
S_OR_LATER := 1
-endif # PLATFORM_VERSION == S
-
-ifeq ($(PLATFORM_VERSION),R)
-P_OR_LATER := 1
-Q_OR_LATER := 1
-R_OR_LATER := 1
-endif # PLATFORM_VERSION == R
-
-ifeq ($(PLATFORM_VERSION),11)
-P_OR_LATER := 1
-Q_OR_LATER := 1
-R_OR_LATER := 1
-endif # PLATFORM_VERSION == 11
CPP_VERSION := c++14