Commit ad085c3a authored by Herman van Hazendonk's avatar Herman van Hazendonk

[PATCH] Replace android headers hard-coded include path with pkgconfig

To allow for a more flexible approach in terms of Android headers
location.
Signed-off-by: default avatarNikolay Nizov <nizovn@gmail.com>
Signed-off-by: default avatarHerman van Hazendonk <github.com@herrie.org>
parent bcdff5b1
......@@ -17,3 +17,6 @@ target.path = $$PLUGINPATH
INSTALLS += target
config_hybris {
CONFIG += link_pkgconfig
}
......@@ -9,5 +9,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
......@@ -7,7 +7,7 @@ SOURCES += hybrisalsadaptor.cpp \
hybrisalsadaptorplugin.cpp
LIBS+= -L../../core -lhybrissensorfw-qt5
include(../adaptor-config.pri )
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
......@@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
......@@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
......@@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
......@@ -7,7 +7,7 @@ SOURCES += hybrispressureadaptor.cpp \
hybrispressureadaptorplugin.cpp
LIBS+= -L../../core -lhybrissensorfw-qt5
include(../adaptor-config.pri )
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
......@@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
......@@ -7,7 +7,7 @@ SOURCES += hybrisstepcounteradaptor.cpp \
hybrisstepcounteradaptorplugin.cpp
LIBS+= -L../../core -lhybrissensorfw-qt5
include(../adaptor-config.pri )
include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
TEMPLATE = app
INCLUDEPATH=/usr/include/android
CONFIG += link_pkgconfig
PKGCONFIG += android-headers
TARGET = hybris
SOURCES += main.cpp
......@@ -6,7 +6,7 @@ TARGET = hybrissensorfw
include( ../common-config.pri )
CONFIG += link_pkgconfig
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
SENSORFW_INCLUDEPATHS = .. \
../include \
......
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