Skip to content

S
swiftshader
Commit c33b473f by Nicolas Capens Committed by Nicolas Capens
Options

Add libnativewindow dependency.

The functions relating to ANativeWindow have been split off from libandroid into libnativewindow as part of project Treble. Change-Id: I59850e4ba4145e49735698901dc2ba3480c68509 Reviewed-on: https://swiftshader-review.googlesource.com/11229Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent dc209330
Showing with 22 additions and 0 deletions
src/Android.mk
...@@ -26,6 +26,11 @@ COMMON_C_INCLUDES += \ ...@@ -26,6 +26,11 @@ COMMON_C_INCLUDES += \
$(LOCAL_PATH)/../third_party/LLVM/include $(LOCAL_PATH)/../third_party/LLVM/include
endif endif
# libnativewindow is introduced from O
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
COMMON_SHARED_LIBRARIES := libnativewindow
endif
# Marshmallow does not have stlport, but comes with libc++ by default # Marshmallow does not have stlport, but comes with libc++ by default
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -lt 23 && echo PreMarshmallow),PreMarshmallow)
COMMON_C_INCLUDES += external/stlport/stlport COMMON_C_INCLUDES += external/stlport/stlport
...@@ -148,6 +153,7 @@ LOCAL_MODULE_TAGS := optional ...@@ -148,6 +153,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(COMMON_SRC_FILES) LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_CFLAGS := $(COMMON_CFLAGS) -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE LOCAL_CFLAGS := $(COMMON_CFLAGS) -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES) LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
...@@ -157,6 +163,7 @@ LOCAL_MODULE_TAGS := optional ...@@ -157,6 +163,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(COMMON_SRC_FILES) LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
LOCAL_CFLAGS := $(COMMON_CFLAGS) -UNDEBUG -g -O0 -DDEFAULT_THREAD_COUNT=1 LOCAL_CFLAGS := $(COMMON_CFLAGS) -UNDEBUG -g -O0 -DDEFAULT_THREAD_COUNT=1
LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES) LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))
src/OpenGL/libEGL/Android.mk
...@@ -39,6 +39,11 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -39,6 +39,11 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware libhardware
# libnativewindow is introduced from O
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
COMMON_SHARED_LIBRARIES += libnativewindow
endif
# gralloc1 is introduced from N MR1 # gralloc1 is introduced from N MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25 && echo NMR1),NMR1) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25 && echo NMR1),NMR1)
COMMON_CFLAGS += -DHAVE_GRALLOC1 COMMON_CFLAGS += -DHAVE_GRALLOC1
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -61,6 +61,11 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -61,6 +61,11 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware libhardware
# libnativewindow is introduced from O
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
COMMON_SHARED_LIBRARIES += libnativewindow
endif
# gralloc1 is introduced from N MR1 # gralloc1 is introduced from N MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25 && echo NMR1),NMR1) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25 && echo NMR1),NMR1)
COMMON_CFLAGS += -DHAVE_GRALLOC1 COMMON_CFLAGS += -DHAVE_GRALLOC1
......
src/OpenGL/libGLESv2/Android.mk
...@@ -68,6 +68,11 @@ COMMON_SHARED_LIBRARIES := \ ...@@ -68,6 +68,11 @@ COMMON_SHARED_LIBRARIES := \
libcutils \ libcutils \
libhardware libhardware
# libnativewindow is introduced from O
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
COMMON_SHARED_LIBRARIES += libnativewindow
endif
# gralloc1 is introduced from N MR1 # gralloc1 is introduced from N MR1
ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25 && echo NMR1),NMR1) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 25 && echo NMR1),NMR1)
COMMON_CFLAGS += -DHAVE_GRALLOC1 COMMON_CFLAGS += -DHAVE_GRALLOC1
......
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