summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--geomagneticd/Android.mk31
-rw-r--r--sensors/Android.mk15
-rw-r--r--sensors/geomagneticd/geomagneticd.c (renamed from geomagneticd/geomagneticd.c)0
3 files changed, 15 insertions, 31 deletions
diff --git a/geomagneticd/Android.mk b/geomagneticd/Android.mk
deleted file mode 100644
index 3aa3dc9..0000000
--- a/geomagneticd/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2013 Paul Kocialkowski
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- geomagneticd.c
-
-LOCAL_SHARED_LIBRARIES := libutils libcutils liblog
-LOCAL_PRELINK_MODULE := false
-
-LOCAL_MODULE := geomagneticd
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_EXECUTABLE)
diff --git a/sensors/Android.mk b/sensors/Android.mk
index a0a9b83..131c4f7 100644
--- a/sensors/Android.mk
+++ b/sensors/Android.mk
@@ -44,3 +44,18 @@ ifeq ($(TARGET_DEVICE),p3100)
endif
include $(BUILD_SHARED_LIBRARY)
+
+LOCAL_PATH := $(LOCAL_PATH)/geomagneticd
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+ geomagneticd.c
+
+LOCAL_SHARED_LIBRARIES := libutils libcutils liblog
+LOCAL_PRELINK_MODULE := false
+
+LOCAL_MODULE := geomagneticd
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_EXECUTABLE)
diff --git a/geomagneticd/geomagneticd.c b/sensors/geomagneticd/geomagneticd.c
index 5de6a7a..5de6a7a 100644
--- a/geomagneticd/geomagneticd.c
+++ b/sensors/geomagneticd/geomagneticd.c