Skip to content

S
swiftshader
Commit 7e45f6d1 by Greg Hartman Committed by Nicolas Capens
Options

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/17768Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent c80eada5
Showing with 10 additions and 10 deletions
src/Android.mk
...@@ -17,8 +17,8 @@ COMMON_C_INCLUDES += \ ...@@ -17,8 +17,8 @@ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/LLVM/include $(LOCAL_PATH)/../third_party/LLVM/include
endif endif
# Project Treble is introduced from Oreo # Project Treble is introduced from Oreo MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
COMMON_SHARED_LIBRARIES := libnativewindow liblog COMMON_SHARED_LIBRARIES := libnativewindow liblog
COMMON_HEADER_LIBRARIES := libhardware_headers libnativebase_headers COMMON_HEADER_LIBRARIES := libhardware_headers libnativebase_headers
COMMON_STATIC_LIBRARIES := libarect COMMON_STATIC_LIBRARIES := libarect
......
src/OpenGL/compiler/Android.mk
...@@ -79,8 +79,8 @@ COMMON_SRC_FILES := \ ...@@ -79,8 +79,8 @@ COMMON_SRC_FILES := \
ValidateLimitations.cpp \ ValidateLimitations.cpp \
ValidateSwitch.cpp \ ValidateSwitch.cpp \
# liblog_headers is introduced from O # liblog_headers is introduced from O MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OMR1),OMR1)
COMMON_HEADER_LIBRARIES := liblog_headers COMMON_HEADER_LIBRARIES := liblog_headers
else else
COMMON_HEADER_LIBRARIES := COMMON_HEADER_LIBRARIES :=
......
src/OpenGL/libEGL/Android.mk
...@@ -43,8 +43,8 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -43,8 +43,8 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware libhardware
# Project Treble is introduced from Oreo # Project Treble is introduced from Oreo MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
COMMON_SHARED_LIBRARIES += libnativewindow COMMON_SHARED_LIBRARIES += libnativewindow
COMMON_STATIC_LIBRARIES += libarect COMMON_STATIC_LIBRARIES += libarect
COMMON_HEADER_LIBRARIES += libnativebase_headers COMMON_HEADER_LIBRARIES += libnativebase_headers
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -66,8 +66,8 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -66,8 +66,8 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware libhardware
# Project Treble is introduced from Oreo # Project Treble is introduced from Oreo MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
COMMON_SHARED_LIBRARIES += libnativewindow COMMON_SHARED_LIBRARIES += libnativewindow
COMMON_STATIC_LIBRARIES += libarect COMMON_STATIC_LIBRARIES += libarect
COMMON_HEADER_LIBRARIES := libnativebase_headers COMMON_HEADER_LIBRARIES := libnativebase_headers
......
src/OpenGL/libGLESv2/Android.mk
...@@ -75,8 +75,8 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -75,8 +75,8 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware libhardware
# Project Treble is introduced from Oreo # Project Treble is introduced from Oreo MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo Oreo),Oreo) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 27 && echo OreoMR1),OreoMR1)
COMMON_SHARED_LIBRARIES += libnativewindow COMMON_SHARED_LIBRARIES += libnativewindow
COMMON_STATIC_LIBRARIES += libarect COMMON_STATIC_LIBRARIES += libarect
COMMON_HEADER_LIBRARIES := libnativebase_headers COMMON_HEADER_LIBRARIES := libnativebase_headers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment