diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-12-02 12:32:39 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-01-17 22:41:00 +0100 |
| commit | 153b50ec9714ff4ba6ce083ca0d49fd31658ce15 (patch) | |
| tree | 8dab0e630a39552385d42a266ba39dfdaf837752 /libsensors/Android.mk | |
| parent | b8515d8e0376e300ed17598f0288fad0e6ae0d89 (diff) | |
| download | device_samsung_tuna-153b50ec9714ff4ba6ce083ca0d49fd31658ce15.zip device_samsung_tuna-153b50ec9714ff4ba6ce083ca0d49fd31658ce15.tar.gz device_samsung_tuna-153b50ec9714ff4ba6ce083ca0d49fd31658ce15.tar.bz2 | |
sensors: Merge invensense HAL into main tuna HAL.
Since these are both in our device tree now, there's no need to
have them be separated. This saves about 14KB of space as well.
Change-Id: Ibfcd7da4b30bb261586ecd9373e6fd4a343e0e06
Diffstat (limited to 'libsensors/Android.mk')
| -rw-r--r-- | libsensors/Android.mk | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libsensors/Android.mk b/libsensors/Android.mk index 98d03b0..2d2d274 100644 --- a/libsensors/Android.mk +++ b/libsensors/Android.mk @@ -11,10 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - LOCAL_PATH := $(call my-dir) +include $(call all-named-subdir-makefiles,mlsdk) + # HAL module implemenation stored in # hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.product.board>.so include $(CLEAR_VARS) @@ -25,10 +25,19 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../invensense/libinvensense_hal/ +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/mlsdk/platform/include \ + $(LOCAL_PATH)/mlsdk/platform/include/linux \ + $(LOCAL_PATH)/mlsdk/platform/linux \ + $(LOCAL_PATH)/mlsdk/mllite \ + $(LOCAL_PATH)/mlsdk/mldmp \ + $(LOCAL_PATH)/mlsdk/external/aichi \ + $(LOCAL_PATH)/mlsdk/external/akmd + LOCAL_SRC_FILES := \ sensors.cpp \ + SensorBase.cpp \ + MPLSensor.cpp \ InputEventReader.cpp \ LightSensor.cpp \ ProximitySensor.cpp \ @@ -36,7 +45,10 @@ LOCAL_SRC_FILES := \ SamsungSensorBase.cpp \ TemperatureSensor.cpp -LOCAL_SHARED_LIBRARIES := libinvensense_hal.$(TARGET_BOOTLOADER_BOARD_NAME) liblog libcutils libutils libdl +LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libdl libmllite libmlplatform +LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" +LOCAL_CPPFLAGS := -DLINUX=1 +LOCAL_LDFLAGS := -rdynamic LOCAL_CLANG := true LOCAL_CFLAGS += -Wall -Werror |