Changes - SailfishOS Open Build Service

Changes of Revision 3

[-] [+]	Changed	_service:tar_git:libhybris.spec
@@ -1,5 +1,5 @@ Name: libhybris -Version: 0.0.5.33+tama.20191111182425.1.g3ceea73 +Version: 0.0.5.33.tama.1 Release: 1%{?dist} Summary: Utilize Bionic-based HW adaptations on glibc systems
[-] [+]	Changed	_service:tar_git:libhybris-0.0.5.33.tama.1.tar.bz2/libhybris/hybris/common/mm/linker.cpp ^
@@ -3231,10 +3231,10 @@ } // Use LD_LIBRARY_PATH and LD_PRELOAD (but only if we aren't setuid/setgid). - if (DEFAULT_HYBRIS_LD_LIBRARY_PATH) - parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); - else + if (ldpath_env) parse_LD_LIBRARY_PATH(ldpath_env); + else + parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); parse_LD_PRELOAD(ldpreload_env); somain = si; @@ -3384,10 +3384,10 @@ ldpreload_env = getenv("HYBRIS_LD_PRELOAD"); } - if (DEFAULT_HYBRIS_LD_LIBRARY_PATH) - parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); - else + if (ldpath_env) parse_LD_LIBRARY_PATH(ldpath_env); + else + parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); parse_LD_PRELOAD(ldpreload_env); if (sdk_version > 0)
[-] [+]	Changed	_service:tar_git:libhybris-0.0.5.33.tama.1.tar.bz2/libhybris/hybris/common/n/linker.cpp ^
@@ -4561,10 +4561,10 @@ #endif // Use LD_LIBRARY_PATH and LD_PRELOAD (but only if we aren't setuid/setgid). - if (DEFAULT_HYBRIS_LD_LIBRARY_PATH) - parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); - else + if (ldpath_env) parse_LD_LIBRARY_PATH(ldpath_env); + else + parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); parse_LD_PRELOAD(ldpreload_env); parse_LD_SHIM_LIBS(ldshim_libs_env); @@ -4719,10 +4719,10 @@ ldpreload_env = getenv("HYBRIS_LD_PRELOAD"); } - if (DEFAULT_HYBRIS_LD_LIBRARY_PATH) - parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); - else + if (ldpath_env) parse_LD_LIBRARY_PATH(ldpath_env); + else + parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); parse_LD_PRELOAD(ldpreload_env); if (sdk_version > 0)
[-] [+]	Changed	_service:tar_git:libhybris-0.0.5.33.tama.1.tar.bz2/libhybris/hybris/common/o/Makefile.am ^
@@ -49,6 +49,11 @@ -DDEFAULT_HYBRIS_LD_LIBRARY_PATH="\"@DEFAULT_HYBRIS_LD_LIBRARY_PATH@\"" \ $(ARCH_FLAGS) \ $(ANDROID_HEADERS_CFLAGS) + +if HAS_ANDROID_9_0_0 +o_la_CPPFLAGS += -DHAS_ANDROID_9_0_0 +endif + o_la_LDFLAGS = \ -lsupc++ \ -module \
[-] [+]	Changed	_service:tar_git:libhybris-0.0.5.33.tama.1.tar.bz2/libhybris/hybris/common/o/linker.cpp ^
@@ -110,22 +110,34 @@ static const char* const kVendorLibEglDir = "/vendor/lib64/egl"; static const char* const kOdmLibDir = "/odm/lib64"; static const char* const kOdmLibEglDir = "/odm/lib64/egl"; +#ifdef HAS_ANDROID_9_0_0 +static const char* const kSystemLibVndk28Dir = "/system/lib64/vndk-28"; +#endif static const char* const kAsanSystemLibDir = "/data/asan/system/lib64"; static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib64"; static const char* const kAsanVendorLibEglDir = "/data/asan/vendor/lib64/egl"; static const char* const kAsanOdmLibDir = "/data/asan/odm/lib64"; static const char* const kAsanOdmLibEglDir = "/data/asan/odm/lib64/egl"; +#ifdef HAS_ANDROID_9_0_0 +static const char* const kAsanSystemLibVndk28Dir = "/data/asan/system/lib64/vndk-28"; +#endif #else static const char* const kSystemLibDir = "/system/lib"; static const char* const kVendorLibDir = "/vendor/lib"; static const char* const kVendorLibEglDir = "/vendor/lib/egl"; static const char* const kOdmLibDir = "/odm/lib"; static const char* const kOdmLibEglDir = "/odm/lib/egl"; +#ifdef HAS_ANDROID_9_0_0 +static const char* const kSystemLibVndk28Dir = "/system/lib/vndk-28"; +#endif static const char* const kAsanSystemLibDir = "/data/asan/system/lib"; static const char* const kAsanVendorLibDir = "/data/asan/vendor/lib"; static const char* const kAsanVendorLibEglDir = "/data/asan/vendor/lib/egl"; static const char* const kAsanOdmLibDir = "/data/asan/odm/lib"; static const char* const kAsanOdmLibEglDir = "/data/asan/odm/lib/egl"; +#ifdef HAS_ANDROID_9_0_0 +static const char* const kAsanSystemLibVndk28Dir = "/data/asan/system/lib/vndk-28"; +#endif #endif static const char* const kAsanLibDirPrefix = "/data/asan"; @@ -135,8 +147,13 @@ kOdmLibDir, kVendorLibDir, + // libhybris support: kOdmLibEglDir, kVendorLibEglDir, + +#ifdef HAS_ANDROID_9_0_0 + kSystemLibVndk28Dir, +#endif nullptr }; @@ -153,6 +170,11 @@ kOdmLibEglDir, kAsanVendorLibEglDir, kVendorLibEglDir, + +#ifdef HAS_ANDROID_9_0_0 + kAsanSystemLibVndk28Dir, + kSystemLibVndk28Dir, +#endif nullptr };
[-] [+]	Changed	_service:tar_git:libhybris-0.0.5.33.tama.1.tar.bz2/libhybris/hybris/common/o/linker_main.cpp ^
@@ -340,10 +340,10 @@ } // Use LD_LIBRARY_PATH and LD_PRELOAD (but only if we aren't setuid/setgid). - if (DEFAULT_HYBRIS_LD_LIBRARY_PATH) - parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); - else + if (ldpath_env) parse_LD_LIBRARY_PATH(ldpath_env); + else + parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); parse_LD_PRELOAD(ldpreload_env); somain = si; @@ -516,10 +516,10 @@ ldpreload_env = getenv("HYBRIS_LD_PRELOAD"); } - if (DEFAULT_HYBRIS_LD_LIBRARY_PATH) - parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); - else + if (ldpath_env) parse_LD_LIBRARY_PATH(ldpath_env); + else + parse_LD_LIBRARY_PATH(DEFAULT_HYBRIS_LD_LIBRARY_PATH); parse_LD_PRELOAD(ldpreload_env); if (sdk_version > 0)
[-] [+]	Changed	_service:tar_git:libhybris-0.0.5.33.tama.1.tar.bz2/libhybris/hybris/configure.ac ^
@@ -228,6 +228,7 @@ AC_MSG_NOTICE("Android headers version is $android_headers_major.$android_headers_minor.$android_headers_patch") # Add automake tests for version/API needs here that you need in code, including test .am's +AM_CONDITIONAL([HAS_ANDROID_9_0_0], [test $android_headers_major -ge 9 -a $android_headers_minor -ge 0 ]) AM_CONDITIONAL([HAS_ANDROID_8_0_0], [test $android_headers_major -ge 8 -a $android_headers_minor -ge 0 ]) AM_CONDITIONAL([HAS_ANDROID_7_0_0], [test $android_headers_major -ge 7 -a $android_headers_minor -ge 0 ]) AM_CONDITIONAL([HAS_ANDROID_6_0_0], [test $android_headers_major -ge 6 -a $android_headers_minor -ge 0 ])
[-] [+]	Changed	_service:tar_git:libhybris-0.0.5.33.tama.1.tar.bz2/libhybris/hybris/include/hybris/properties/properties.h ^
@@ -25,8 +25,6 @@ #include <unistd.h> #include <stdint.h> -#include <android-config.h> - /* Based on Android */ #define PROP_SERVICE_NAME "property_service"