Build lib*_swiftshader with BOARD_VNDK_VERSION

When BOARD_VNDK_VERSION is set, a vendor lib cannot link against a
platform lib and is not provided with global include path. So, some
internal libraries such as swiftshader_top_[release|debug] were also
marked as vendor module and dependency to some header libs
(libhardware_headers, libnativebase_headers, etc.) were added
explicitly.

Bug: 64704866
Test: lunch sdk_gphone_x86-user, BOARD_VNDK_VERSION=current m -j
libEGL_swiftshader libGLESv1_CM_swiftshader libGLESv2_swiftshader
successful

Change-Id: I37851c9876f7f7c247bbc5d6e18946cb5bf72fa2
Reviewed-on: https://swiftshader-review.googlesource.com/11868
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 7f1efa2..1029b83 100644 (file)
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -23,7 +23,9 @@ endif
 
 # libnativewindow is introduced from O
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
-COMMON_SHARED_LIBRARIES := libnativewindow
+COMMON_SHARED_LIBRARIES := libnativewindow liblog
+COMMON_HEADER_LIBRARIES := libhardware_headers libnativebase_headers
+COMMON_STATIC_LIBRARIES := libarect
 endif
 
 # Marshmallow does not have stlport, but comes with libc++ by default
@@ -144,21 +146,27 @@ LOCAL_CFLAGS_arm += -DSZTARGET=ARM32
 include $(CLEAR_VARS)
 LOCAL_CLANG := true
 LOCAL_MODULE := swiftshader_top_release
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_CFLAGS := $(COMMON_CFLAGS) -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
 LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
+LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES)
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_CLANG := true
 LOCAL_MODULE := swiftshader_top_debug
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_CFLAGS := $(COMMON_CFLAGS) -UNDEBUG -g -O0 -DDEFAULT_THREAD_COUNT=1
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
 LOCAL_SHARED_LIBRARIES := $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
+LOCAL_STATIC_LIBRARIES := $(COMMON_STATIC_LIBRARIES)
 include $(BUILD_STATIC_LIBRARY)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/src/Common/GrallocAndroid.hpp b/src/Common/GrallocAndroid.hpp
index 3273372..3ebb5d7 100644 (file)
--- a/src/Common/GrallocAndroid.hpp
+++ b/src/Common/GrallocAndroid.hpp
@@ -23,6 +23,8 @@
 #include <sync/sync.h>
 #endif
 
+#include <unistd.h> // for close()
+
 class GrallocModule
 {
 public:

diff --git a/src/OpenGL/compiler/Android.mk b/src/OpenGL/compiler/Android.mk
index da35aa0..95b3018 100644 (file)
--- a/src/OpenGL/compiler/Android.mk
+++ b/src/OpenGL/compiler/Android.mk
@@ -76,6 +76,7 @@ include $(CLEAR_VARS)
 LOCAL_CLANG := true
 LOCAL_MODULE := swiftshader_compiler_release
 LOCAL_MODULE_TAGS := optional
+LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_CFLAGS += \
        $(COMMON_CFLAGS) \
@@ -83,12 +84,14 @@ LOCAL_CFLAGS += \
        -fdata-sections \
        -DANGLE_DISABLE_TRACE
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+LOCAL_SHARED_LIBRARIES := libcutils
 include $(BUILD_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_CLANG := true
 LOCAL_MODULE := swiftshader_compiler_debug
 LOCAL_MODULE_TAGS := optional
+LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 
 LOCAL_CFLAGS += \
@@ -98,4 +101,5 @@ LOCAL_CFLAGS += \
        -O0
 
 LOCAL_C_INCLUDES := $(COMMON_C_INCLUDES)
+LOCAL_SHARED_LIBRARIES := libcutils
 include $(BUILD_STATIC_LIBRARY)

diff --git a/src/OpenGL/libEGL/Android.mk b/src/OpenGL/libEGL/Android.mk
index 9fae01d..6020ee3 100644 (file)
--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -42,6 +42,8 @@ COMMON_SHARED_LIBRARIES := \
 # libnativewindow is introduced from O
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
 COMMON_SHARED_LIBRARIES += libnativewindow
+COMMON_STATIC_LIBRARIES += libarect
+COMMON_HEADER_LIBRARIES += libnativebase_headers
 endif
 
 # gralloc1 is introduced from N MR1
@@ -79,6 +81,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
 include $(BUILD_SHARED_LIBRARY)
@@ -102,6 +105,7 @@ LOCAL_SRC_FILES := $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -DANGLE_DISABLE_TRACE
 include $(BUILD_SHARED_LIBRARY)

diff --git a/src/OpenGL/libGLES_CM/Android.mk b/src/OpenGL/libGLES_CM/Android.mk
index 38dbaf3..06da2bd 100644 (file)
--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -64,6 +64,8 @@ COMMON_SHARED_LIBRARIES := \
 # libnativewindow is introduced from O
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
 COMMON_SHARED_LIBRARIES += libnativewindow
+COMMON_STATIC_LIBRARIES += libarect
+COMMON_HEADER_LIBRARIES := libnativebase_headers
 endif
 
 # gralloc1 is introduced from N MR1
@@ -102,6 +104,7 @@ LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
 include $(BUILD_SHARED_LIBRARY)
@@ -125,6 +128,7 @@ LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 LOCAL_CFLAGS += \
        $(COMMON_CFLAGS) \

diff --git a/src/OpenGL/libGLESv2/Android.mk b/src/OpenGL/libGLESv2/Android.mk
index 4e7d931..a2f393f 100644 (file)
--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -71,6 +71,8 @@ COMMON_SHARED_LIBRARIES := \
 # libnativewindow is introduced from O
 ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo O),O)
 COMMON_SHARED_LIBRARIES += libnativewindow
+COMMON_STATIC_LIBRARIES += libarect
+COMMON_HEADER_LIBRARIES := libnativebase_headers
 endif
 
 # gralloc1 is introduced from N MR1
@@ -109,6 +111,7 @@ LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += swiftshader_compiler_debug swiftshader_top_debug $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 LOCAL_CFLAGS += $(COMMON_CFLAGS) -UNDEBUG -g -O0
 include $(BUILD_SHARED_LIBRARY)
@@ -132,6 +135,7 @@ LOCAL_SRC_FILES += $(COMMON_SRC_FILES)
 LOCAL_C_INCLUDES += $(COMMON_C_INCLUDES)
 LOCAL_STATIC_LIBRARIES += swiftshader_compiler_release swiftshader_top_release $(COMMON_STATIC_LIBRARIES)
 LOCAL_SHARED_LIBRARIES += $(COMMON_SHARED_LIBRARIES)
+LOCAL_HEADER_LIBRARIES := $(COMMON_HEADER_LIBRARIES)
 LOCAL_LDFLAGS += $(COMMON_LDFLAGS)
 LOCAL_CFLAGS += \
        $(COMMON_CFLAGS) \

diff --git a/third_party/LLVM/Android.mk b/third_party/LLVM/Android.mk
index a46b33b..23a707a 100644 (file)
--- a/third_party/LLVM/Android.mk
+++ b/third_party/LLVM/Android.mk
@@ -5,6 +5,7 @@ LOCAL_CLANG := true
 
 LOCAL_MODULE := libLLVM_swiftshader
 LOCAL_MODULE_TAGS := optional
+LOCAL_VENDOR_MODULE := true
 
 LOCAL_SRC_FILES := \
        lib/Analysis/AliasAnalysis.cpp \