diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-01-26 01:08:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-26 01:08:31 +0000 |
| commit | dfe9dbb9cf535e97d7dc10a5a582c03413c90e1a (patch) | |
| tree | 3df8cf187a5d77f5972c9de157cad610854f1f9a | |
| parent | a2364e24811e3887505d660f4c789334edd31768 (diff) | |
| parent | ea02c7e9479bbb11afd65010faa54e2867be8f68 (diff) | |
| download | gps-dfe9dbb9cf535e97d7dc10a5a582c03413c90e1a.tar.gz | |
Merge "Make marlin gps build with the VNDK."
| -rw-r--r-- | msm8996/loc_api/libloc_api_50001/loc.cpp | 1 | ||||
| -rw-r--r-- | msm8996/utils/Android.mk | 5 | ||||
| -rw-r--r-- | msm8996/utils/loc_target.cpp | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/msm8996/loc_api/libloc_api_50001/loc.cpp b/msm8996/loc_api/libloc_api_50001/loc.cpp index 4970915..781df6e 100644 --- a/msm8996/loc_api/libloc_api_50001/loc.cpp +++ b/msm8996/loc_api/libloc_api_50001/loc.cpp @@ -48,6 +48,7 @@ #include <sys/un.h> #include <sstream> #include <string> +#include <unistd.h> using namespace loc_core; diff --git a/msm8996/utils/Android.mk b/msm8996/utils/Android.mk index cff57a8..691d494 100644 --- a/msm8996/utils/Android.mk +++ b/msm8996/utils/Android.mk @@ -12,6 +12,9 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ liblog +LOCAL_HEADER_LIBRARIES := \ + libhardware_headers + LOCAL_SRC_FILES += \ loc_log.cpp \ loc_cfg.cpp \ @@ -55,6 +58,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libgps.utils_headers +LOCAL_HEADER_LIBRARIES := libhardware_headers +LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := libhardware_headers LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) $(LOCAL_PATH)/platform_lib_abstractions include $(BUILD_HEADER_LIBRARY) diff --git a/msm8996/utils/loc_target.cpp b/msm8996/utils/loc_target.cpp index faaedf6..cd7c8b9 100644 --- a/msm8996/utils/loc_target.cpp +++ b/msm8996/utils/loc_target.cpp @@ -34,6 +34,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <errno.h> +#include <unistd.h> #include <hardware/gps.h> #include <cutils/properties.h> #include "loc_target.h" |