diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-02-09 03:49:09 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-09 03:49:09 +0000 |
commit | 2a21ddaac6af51e486969b59a13c522ea694a28b (patch) | |
tree | 89fc208db3781e1c9be88c528b00c4a2a513d868 | |
parent | 6eadeabb4931321dcf046019d71b1194e8c932ea (diff) | |
parent | b5faf7a918b3477710d20693a974e5900f82176e (diff) | |
download | akm-master.tar.gz |
Merge "Convert Android.mk file to Android.bp"HEADandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releasemastermain
-rw-r--r-- | AK8975_FS/akmdfs/Android.bp | 35 | ||||
-rw-r--r-- | AK8975_FS/akmdfs/Android.mk | 37 | ||||
-rw-r--r-- | AK8975_FS/libsensors/Android.bp | 40 | ||||
-rw-r--r-- | AK8975_FS/libsensors/Android.mk | 45 |
4 files changed, 75 insertions, 82 deletions
diff --git a/AK8975_FS/akmdfs/Android.bp b/AK8975_FS/akmdfs/Android.bp new file mode 100644 index 0000000..d687007 --- /dev/null +++ b/AK8975_FS/akmdfs/Android.bp @@ -0,0 +1,35 @@ +// dmtd +//#### AKM daemon ############################################### +cc_binary { + name: "akmdfs", + local_include_dirs: ["AKFS_APIs_8975"], + srcs: [ + "AKFS_APIs_8975/AKFS_AK8975.c", + "AKFS_APIs_8975/AKFS_AOC.c", + "AKFS_APIs_8975/AKFS_Device.c", + "AKFS_APIs_8975/AKFS_Direction.c", + "AKFS_APIs_8975/AKFS_VNorm.c", + "AK8975Driver.c", + "AKFS_APIs.c", + "AKFS_Disp.c", + "AKFS_FileIO.c", + "AKFS_Measure.c", + "main.c", + ], + cflags: [ + "-Wall", + "-Werror", + "-Wno-unused-parameter", + "-DENABLE_AKMDEBUG=1", + "-DOUTPUT_STDOUT=1", + "-DDBG_LEVEL=2", + ], + static_executable: false, + shared_libs: [ + "libc", + "libm", + "liblog", + "libutils", + "libcutils", + ], +} diff --git a/AK8975_FS/akmdfs/Android.mk b/AK8975_FS/akmdfs/Android.mk deleted file mode 100644 index ba48b7d..0000000 --- a/AK8975_FS/akmdfs/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# dmtd -AKM_FS_LIB=AKFS_APIs_8975 - -##### AKM daemon ############################################################### -include $(CLEAR_VARS) - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/$(AKM_FS_LIB) - -LOCAL_SRC_FILES:= \ - $(AKM_FS_LIB)/AKFS_AK8975.c \ - $(AKM_FS_LIB)/AKFS_AOC.c \ - $(AKM_FS_LIB)/AKFS_Device.c \ - $(AKM_FS_LIB)/AKFS_Direction.c \ - $(AKM_FS_LIB)/AKFS_VNorm.c \ - AK8975Driver.c \ - AKFS_APIs.c \ - AKFS_Disp.c \ - AKFS_FileIO.c \ - AKFS_Measure.c \ - main.c - -LOCAL_CFLAGS += \ - -Wall \ - -Werror \ - -Wno-unused-parameter \ - -DENABLE_AKMDEBUG=1 \ - -DOUTPUT_STDOUT=1 \ - -DDBG_LEVEL=2 \ - -LOCAL_MODULE := akmdfs -LOCAL_MODULE_TAGS := optional -LOCAL_FORCE_STATIC_EXECUTABLE := false -LOCAL_SHARED_LIBRARIES := libc libm liblog libutils libcutils -include $(BUILD_EXECUTABLE) diff --git a/AK8975_FS/libsensors/Android.bp b/AK8975_FS/libsensors/Android.bp new file mode 100644 index 0000000..07dbbc8 --- /dev/null +++ b/AK8975_FS/libsensors/Android.bp @@ -0,0 +1,40 @@ +// Copyright (C) 2008 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// 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. +// HAL module implemenation, not prelinked, and stored in +// hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.product.board>.so +cc_library_shared { + name: "sensors.default", + relative_install_path: "hw", + cflags: [ + "-DLOG_TAG=\"Sensors\"", + "-Wall", + "-Werror", + "-Wno-unused-parameter", + "-DSENSORHAL_ACC_ADXL346", + // -DSENSORHAL_ACC_KXTF9 + ], + srcs: [ + "SensorBase.cpp", + "InputEventReader.cpp", + "AkmSensor.cpp", + "sensors.cpp", + "AdxlSensor.cpp", + ], + // KionixSensor.cpp + shared_libs: [ + "liblog", + "libcutils", + "libdl", + ], +} diff --git a/AK8975_FS/libsensors/Android.mk b/AK8975_FS/libsensors/Android.mk deleted file mode 100644 index 08c742d..0000000 --- a/AK8975_FS/libsensors/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (C) 2008 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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) - -# HAL module implemenation, not prelinked, and stored in -# hw/<SENSORS_HARDWARE_MODULE_ID>.<ro.product.board>.so -include $(CLEAR_VARS) - -LOCAL_MODULE := sensors.default - -LOCAL_MODULE_RELATIVE_PATH := hw - -LOCAL_MODULE_TAGS := optional - -LOCAL_CFLAGS := -DLOG_TAG=\"Sensors\" \ - -Wall \ - -Werror \ - -Wno-unused-parameter \ - -DSENSORHAL_ACC_ADXL346 -# -DSENSORHAL_ACC_KXTF9 - -LOCAL_SRC_FILES := \ - SensorBase.cpp \ - InputEventReader.cpp \ - AkmSensor.cpp \ - sensors.cpp \ - AdxlSensor.cpp -# KionixSensor.cpp - -LOCAL_SHARED_LIBRARIES := liblog libcutils libdl - -include $(BUILD_SHARED_LIBRARY) |