diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-31 17:24:51 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-01-31 17:24:51 +0000 |
| commit | d34d9a0db650b0fa75cc79b34798e97b477968ba (patch) | |
| tree | a4156ea38f14b3b4becce7f81f2bd40f420337e5 | |
| parent | 0a8d740c57c0184f62010517e42afbe5098b5e49 (diff) | |
| parent | 2b89fd3e5d3b2d113ccbd7159428949093cca1f8 (diff) | |
| download | device_google_contexthub-d34d9a0db650b0fa75cc79b34798e97b477968ba.tar.gz device_google_contexthub-d34d9a0db650b0fa75cc79b34798e97b477968ba.tar.bz2 device_google_contexthub-d34d9a0db650b0fa75cc79b34798e97b477968ba.zip | |
Snap for 4577102 from 2b89fd3e5d3b2d113ccbd7159428949093cca1f8 to pi-release
Change-Id: I735655e9b70291c3c1782b567caf30b101a40073
| -rw-r--r-- | sensorhal/Android.mk | 6 | ||||
| -rw-r--r-- | util/common/Android.mk | 11 | ||||
| -rw-r--r-- | util/common/JSONObject.cpp | 4 | ||||
| -rw-r--r-- | util/common/file.cpp | 3 | ||||
| -rw-r--r-- | util/common/file.h | 2 | ||||
| -rw-r--r-- | util/common/ring.cpp | 4 |
6 files changed, 19 insertions, 11 deletions
diff --git a/sensorhal/Android.mk b/sensorhal/Android.mk index 385a7622..04bc80eb 100644 --- a/sensorhal/Android.mk +++ b/sensorhal/Android.mk @@ -72,6 +72,9 @@ LOCAL_SRC_FILES := \ sensors.cpp \ ../../../../$(NANOHUB_SENSORHAL_SENSORLIST) +LOCAL_HEADER_LIBRARIES := \ + libhardware_headers + LOCAL_SHARED_LIBRARIES := \ liblog \ libcutils \ @@ -114,6 +117,9 @@ LOCAL_C_INCLUDES += \ LOCAL_SRC_FILES := \ activity.cpp +LOCAL_HEADER_LIBRARIES := \ + libhardware_headers + LOCAL_SHARED_LIBRARIES := \ libcutils \ libhubconnection \ diff --git a/util/common/Android.mk b/util/common/Android.mk index bd40f5a5..62898394 100644 --- a/util/common/Android.mk +++ b/util/common/Android.mk @@ -20,6 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libhubutilcommon LOCAL_MODULE_TAGS := optional +LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS += $(COMMON_CFLAGS) @@ -31,6 +32,16 @@ LOCAL_SRC_FILES := \ JSONObject.cpp \ ring.cpp +LOCAL_HEADER_LIBRARIES := \ + libhardware_headers \ + libstagefright_foundation_headers \ + libstagefright_headers \ + libutils_headers + +LOCAL_EXPORT_HEADER_LIBRARY_HEADERS := \ + libhardware_headers \ + libutils_headers + LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES) include $(BUILD_STATIC_LIBRARY) diff --git a/util/common/JSONObject.cpp b/util/common/JSONObject.cpp index 83ed14e9..8679c719 100644 --- a/util/common/JSONObject.cpp +++ b/util/common/JSONObject.cpp @@ -14,10 +14,6 @@ * limitations under the License. */ -//#define LOG_NDEBUG 0 -#define LOG_TAG "JSONObject" -#include <utils/Log.h> - #include "JSONObject.h" #include <ctype.h> diff --git a/util/common/file.cpp b/util/common/file.cpp index 17576016..daf9e40c 100644 --- a/util/common/file.cpp +++ b/util/common/file.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -//#define LOG_NDEBUG 0 -#define LOG_TAG "file" -#include <utils/Log.h> #include "file.h" #include <fcntl.h> diff --git a/util/common/file.h b/util/common/file.h index 97d74b00..4bbe613c 100644 --- a/util/common/file.h +++ b/util/common/file.h @@ -18,6 +18,8 @@ #define FILE_H_ +#include <stdio.h> // for SEEK_SET + #include <media/stagefright/foundation/ABase.h> #include <utils/Errors.h> diff --git a/util/common/ring.cpp b/util/common/ring.cpp index 245f3d03..c5ac53d6 100644 --- a/util/common/ring.cpp +++ b/util/common/ring.cpp @@ -14,10 +14,6 @@ * limitations under the License. */ -//#define LOG_DEBUG 1 -#define LOG_TAG "ring" -#include <utils/Log.h> - #include "ring.h" #include <stdlib.h> |