Clarify new dependencies since project Treble.

Change-Id: Ia4feb6791c6da8dc4beef86aab7eb4fa06af461b
Reviewed-on: https://swiftshader-review.googlesource.com/11869
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

diff --git a/src/Android.mk b/src/Android.mk
index 1029b83..8621c9f 100644 (file)
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -21,8 +21,8 @@ COMMON_C_INCLUDES += \
        $(LOCAL_PATH)/../third_party/LLVM/include
 endif
 
-# libnativewindow is introduced from O
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
+# Project Treble is introduced from Oreo
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
 COMMON_SHARED_LIBRARIES := libnativewindow liblog
 COMMON_HEADER_LIBRARIES := libhardware_headers libnativebase_headers
 COMMON_STATIC_LIBRARIES := libarect

diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index 6020ee3..dd3796c 100644 (file)
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -39,8 +39,8 @@ COMMON_SHARED_LIBRARIES := \
        libcutils \
        libhardware
 
-# libnativewindow is introduced from O
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
+# Project Treble is introduced from Oreo
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
 COMMON_SHARED_LIBRARIES += libnativewindow
 COMMON_STATIC_LIBRARIES += libarect
 COMMON_HEADER_LIBRARIES += libnativebase_headers

diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 06da2bd..12b68e1 100644 (file)
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -61,8 +61,8 @@ COMMON_SHARED_LIBRARIES := \
        libcutils \
        libhardware
 
-# libnativewindow is introduced from O
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
+# Project Treble is introduced from Oreo
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
 COMMON_SHARED_LIBRARIES += libnativewindow
 COMMON_STATIC_LIBRARIES += libarect
 COMMON_HEADER_LIBRARIES := libnativebase_headers

diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index a2f393f..12c4e9a 100644 (file)
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -68,8 +68,8 @@ COMMON_SHARED_LIBRARIES := \
        libcutils \
        libhardware
 
-# libnativewindow is introduced from O
-ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
+# Project Treble is introduced from Oreo
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo)
 COMMON_SHARED_LIBRARIES += libnativewindow
 COMMON_STATIC_LIBRARIES += libarect
 COMMON_HEADER_LIBRARIES := libnativebase_headers