MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adding the necessary gps.utils cflags and -l flags"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-09 23:17:42 -07:00 committed by Gerrit - the friendly Code Review server
commit 2cb23d6015
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gnss/Makefile.am
View file

@ -38,6 +38,7 @@ libloc_ds_api_CFLAGS = \
$(QMIF_CFLAGS) \ $(QMIF_CFLAGS) \
$(QMI_CFLAGS) \ $(QMI_CFLAGS) \
$(DATA_CFLAGS) \ $(DATA_CFLAGS) \
$(GPSUTILS_CFLAGS) \
-I$(WORKSPACE)/qcom-opensource/location/loc_api/ds_api -I$(WORKSPACE)/qcom-opensource/location/loc_api/ds_api
libloc_ds_api_la_SOURCES = \ libloc_ds_api_la_SOURCES = \
@ -55,11 +56,11 @@ libloc_ds_api_la_LDFLAGS += -Wl,--export-dynamic
libloc_ds_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_ds_api_CFLAGS) libloc_ds_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_ds_api_CFLAGS)
endif endif
libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices -ldsi_netctrl $(GPSUTILS_LIBS) $(LOCPLA_LIBS) \ libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices -ldsi_netctrl $(GPSUTILS_LIBS) $(LOCPLA_LIBS)
$(GPSUTILS_LIBS)
libloc_api_v02_CFLAGS = \ libloc_api_v02_CFLAGS = \
$(QMIF_CFLAGS) \ $(QMIF_CFLAGS) \
$(GPSUTILS_CFLAGS) \
-I$(WORKSPACE)/qcom-opensource/location/loc_api/ds_api \ -I$(WORKSPACE)/qcom-opensource/location/loc_api/ds_api \
-I$(WORKSPACE)/qcom-opensource/location/loc_api/loc_api_v02 -I$(WORKSPACE)/qcom-opensource/location/loc_api/loc_api_v02
@ -81,7 +82,7 @@ libloc_api_v02_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_api_v02_CFLAGS
endif endif
libloc_api_v02_la_CXXFLAGS = -std=c++0x libloc_api_v02_la_CXXFLAGS = -std=c++0x
libloc_api_v02_la_LIBADD = -lstdc++ -lqmi_cci -lqmi_common_so $(QMIF_LIBS) $(LOCPLA_LIBS) ../core/libloc_core.la libloc_ds_api.la libloc_api_v02_la_LIBADD = -lstdc++ -lqmi_cci -lqmi_common_so $(QMIF_LIBS) $(GPSUTILS_LIBS) $(LOCPLA_LIBS) ../core/libloc_core.la libloc_ds_api.la
library_include_HEADERS = \ library_include_HEADERS = \
$(WORKSPACE)/qcom-opensource/location/loc_api/ds_api/ds_client.h \ $(WORKSPACE)/qcom-opensource/location/loc_api/ds_api/ds_client.h \

3
location/Makefile.am
View file

@ -1,5 +1,6 @@
AM_CFLAGS = \ AM_CFLAGS = \
$(LOCPLA_CFLAGS) \ $(LOCPLA_CFLAGS) \
$(GPSUTILS_CFLAGS) \
$(LOCHAL_CFLAGS) \ $(LOCHAL_CFLAGS) \
-I./ \ -I./ \
-I../utils \ -I../utils \
@ -19,7 +20,7 @@ liblocation_api_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
liblocation_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) liblocation_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
endif endif
liblocation_api_la_LIBADD = -lstdc++ $(LOCPLA_LIBS) $(LOCHAL_LIBS) liblocation_api_la_LIBADD = -lstdc++ $(LOCPLA_LIBS) $(GPSUTILS_LIBS) $(LOCHAL_LIBS)
library_include_HEADERS = \ library_include_HEADERS = \
LocationAPI.h \ LocationAPI.h \