commit 7e45f6d1b239819ad107ea66d23e656d47856ec3
author Greg Hartman <ghartman@google.com> Fri Mar 16 00:02:23 2018 -0700
committer Nicolas Capens <nicolascapens@google.com> Tue Apr 10 13:20:51 2018 +0000
tree c2b098e080fef64be81cca5834966a855d2ffbae
parent c80eada522546e50c736fa948e0a861148d94a3e

Correct confusion between Android O and O MR1

libnativebase and liblog_headers didn't exist until O MR1

Bug b/75229322
Test: Local builds K through P DP1
Change-Id: I07361e4ef8a98108536319428741554b937eda1a
Reviewed-on: https://swiftshader-review.googlesource.com/17768
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 945daf8..9c6513a 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -17,8 +17,8 @@
 	$(LOCAL_PATH)/../third_party/LLVM/include
 endif
 
-# Project Treble is introduced from Oreo
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
+# Project Treble is introduced from Oreo MR1
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
 COMMON_SHARED_LIBRARIES := libnativewindow liblog
 COMMON_HEADER_LIBRARIES := libhardware_headers libnativebase_headers
 COMMON_STATIC_LIBRARIES := libarect

src/OpenGL/compiler/Android.mk

diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk
index 6924e48..d29b549 100644
--- a/src/OpenGL/compiler/Android.mk
+++ b/src/OpenGL/compiler/Android.mk
@@ -79,8 +79,8 @@
 	ValidateLimitations.cpp \
 	ValidateSwitch.cpp \
 
-# liblog_headers is introduced from O
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
+# liblog_headers is introduced from O MR1
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OMR1),OMR1)
 COMMON_HEADER_LIBRARIES := liblog_headers
 else
 COMMON_HEADER_LIBRARIES :=

src/OpenGL/libEGL/Android.mk

diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index 64ccc55..1457d8d 100644
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -43,8 +43,8 @@
 	libcutils \
 	libhardware
 
-# Project Treble is introduced from Oreo
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
+# Project Treble is introduced from Oreo MR1
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
 COMMON_SHARED_LIBRARIES += libnativewindow
 COMMON_STATIC_LIBRARIES += libarect
 COMMON_HEADER_LIBRARIES += libnativebase_headers

src/OpenGL/libGLES_CM/Android.mk

diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 9e68a53..1b9974a 100644
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -66,8 +66,8 @@
 	libcutils \
 	libhardware
 
-# Project Treble is introduced from Oreo
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
+# Project Treble is introduced from Oreo MR1
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
 COMMON_SHARED_LIBRARIES += libnativewindow
 COMMON_STATIC_LIBRARIES += libarect
 COMMON_HEADER_LIBRARIES := libnativebase_headers

src/OpenGL/libGLESv2/Android.mk

diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index 94e8089..1b2686f 100644
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -75,8 +75,8 @@
 	libcutils \
 	libhardware
 
-# Project Treble is introduced from Oreo
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
+# Project Treble is introduced from Oreo MR1
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
 COMMON_SHARED_LIBRARIES += libnativewindow
 COMMON_STATIC_LIBRARIES += libarect
 COMMON_HEADER_LIBRARIES := libnativebase_headers