OSDN Git Service
(root)
/
android-x86
/
hardware-intel-libsensors.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/abt/topic/gmin/l-dev/sensors/master' into gmin...
[android-x86/hardware-intel-libsensors.git]
/
Android.mk
diff --git
a/Android.mk
b/Android.mk
index
8d4f8b0
..
1eeb282
100644
(file)
--- a/
Android.mk
+++ b/
Android.mk
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2014 Intel Corporation.
+# Copyright (C) 2014
-2015
Intel Corporation.
#
# IIO sensors HAL module implementation, compiled as hw/iio-sensors-hal.so
#
# IIO sensors HAL module implementation, compiled as hw/iio-sensors-hal.so
@@
-20,6
+20,7
@@
src_files := $(src_path)/entry.c \
$(src_path)/compass-calibration.c \
$(src_path)/matrix-ops.c \
$(src_path)/gyro-calibration.c \
$(src_path)/compass-calibration.c \
$(src_path)/matrix-ops.c \
$(src_path)/gyro-calibration.c \
+ $(src_path)/filtering.c \
LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
LOCAL_MODULE := sensors.$(TARGET_BOARD_PLATFORM)
LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
LOCAL_MODULE := sensors.$(TARGET_BOARD_PLATFORM)
@@
-28,7
+29,6
@@
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
LOCAL_LDFLAGS := -Wl,--gc-sections
LOCAL_MODULE_TAGS := optional
LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
LOCAL_LDFLAGS := -Wl,--gc-sections
-LOCAL_LDLIBS := -lpthreads
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
LOCAL_PRELINK_MODULE := false
LOCAL_SRC_FILES := $(src_files)
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
LOCAL_PRELINK_MODULE := false
LOCAL_SRC_FILES := $(src_files)
@@
-36,13
+36,11
@@
LOCAL_SRC_FILES := $(src_files)
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
-src_path := .
-src_files := $(src_path)/sens.c
LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
LOCAL_MODULE := sens
LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
LOCAL_C_INCLUDES += $(LOCAL_PATH) vendor/intel/hardware/iio-sensors
LOCAL_MODULE := sens
LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -fvisibility=hidden
LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
-LOCAL_SRC_FILES :=
$(src_files)
+LOCAL_SRC_FILES :=
sens.c
LOCAL_MODULE_TAGS := eng
include $(BUILD_EXECUTABLE)
endif
LOCAL_MODULE_TAGS := eng
include $(BUILD_EXECUTABLE)
endif