[-]
[+]
|
Changed |
_service:tar_git:libhybris.spec
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -5,10 +5,11 @@
</service>
<service name="tar_git">
- <param name="url">https://github.com/sailfishos-oneplus5/libhybris.git</param>
- <param name="branch">master</param>
- <param name="revision">bfac4c57a2900209121387e602cf5f05e387efbb</param>
- <param name="token"/>
- <param name="debian">N</param>
- <param name="dumb">N</param>
-</service></services>
+ <param name="url">https://github.com/sailfishos-oneplus5/libhybris.git</param>
+ <param name="branch">master</param>
+ <param name="revision">HEAD</param>
+ <param name="token"/>
+ <param name="debian">N</param>
+ <param name="dumb">N</param>
+ </service>
+</services>
\ No newline at end of file
|
[-]
[+]
|
Changed |
_service:tar_git:libhybris-0.0.5.34.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.34.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.34.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.34.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"
|