diff options
| -rw-r--r-- | cmds/inputflinger/Android.mk | 28 | ||||
| -rw-r--r-- | cmds/sensorservice/Android.mk | 19 | ||||
| -rw-r--r-- | cmds/surfaceflinger/Android.mk | 17 | ||||
| -rw-r--r-- | services/inputflinger/Android.mk | 15 | ||||
| -rw-r--r-- | services/inputflinger/main.cpp (renamed from cmds/inputflinger/main.cpp) | 2 | ||||
| -rw-r--r-- | services/sensorservice/Android.mk | 18 | ||||
| -rw-r--r-- | services/sensorservice/main_sensorservice.cpp (renamed from cmds/sensorservice/main_sensorservice.cpp) | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/Android.mk | 16 | ||||
| -rw-r--r-- | services/surfaceflinger/main_surfaceflinger.cpp (renamed from cmds/surfaceflinger/main_surfaceflinger.cpp) | 2 |
9 files changed, 52 insertions, 67 deletions
diff --git a/cmds/inputflinger/Android.mk b/cmds/inputflinger/Android.mk deleted file mode 100644 index b44de44..0000000 --- a/cmds/inputflinger/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2013 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) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main.cpp - -LOCAL_SHARED_LIBRARIES := \ - libbinder \ - libinputflinger \ - libutils - -LOCAL_MODULE := inputflinger - -include $(BUILD_EXECUTABLE) diff --git a/cmds/sensorservice/Android.mk b/cmds/sensorservice/Android.mk deleted file mode 100644 index 0811be5..0000000 --- a/cmds/sensorservice/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main_sensorservice.cpp - -LOCAL_SHARED_LIBRARIES := \ - libsensorservice \ - libbinder \ - libutils - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../services/sensorservice - -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE:= sensorservice - -include $(BUILD_EXECUTABLE) diff --git a/cmds/surfaceflinger/Android.mk b/cmds/surfaceflinger/Android.mk deleted file mode 100644 index 1df32bb..0000000 --- a/cmds/surfaceflinger/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - main_surfaceflinger.cpp - -LOCAL_SHARED_LIBRARIES := \ - libsurfaceflinger \ - libbinder \ - libutils - -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../services/surfaceflinger - -LOCAL_MODULE:= surfaceflinger - -include $(BUILD_EXECUTABLE) diff --git a/services/inputflinger/Android.mk b/services/inputflinger/Android.mk index 7148db8..e32d38a 100644 --- a/services/inputflinger/Android.mk +++ b/services/inputflinger/Android.mk @@ -33,3 +33,18 @@ LOCAL_MODULE := libinputflinger include $(BUILD_SHARED_LIBRARY) +######################################################################## +# build input flinger executable +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + main.cpp + +LOCAL_SHARED_LIBRARIES := \ + libbinder \ + libinputflinger \ + libutils + +LOCAL_MODULE := inputflinger + +include $(BUILD_EXECUTABLE) diff --git a/cmds/inputflinger/main.cpp b/services/inputflinger/main.cpp index 6de7b24..3209a62 100644 --- a/cmds/inputflinger/main.cpp +++ b/services/inputflinger/main.cpp @@ -15,7 +15,7 @@ */ #include <binder/BinderService.h> -#include <InputFlinger.h> +#include "InputFlinger.h" using namespace android; diff --git a/services/sensorservice/Android.mk b/services/sensorservice/Android.mk index 14a4e55..4f24ddc 100644 --- a/services/sensorservice/Android.mk +++ b/services/sensorservice/Android.mk @@ -31,3 +31,21 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= libsensorservice include $(BUILD_SHARED_LIBRARY) + +##################################################################### +# build executable +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + main_sensorservice.cpp + +LOCAL_SHARED_LIBRARIES := \ + libsensorservice \ + libbinder \ + libutils + +LOCAL_MODULE_TAGS := optional + +LOCAL_MODULE:= sensorservice + +include $(BUILD_EXECUTABLE) diff --git a/cmds/sensorservice/main_sensorservice.cpp b/services/sensorservice/main_sensorservice.cpp index 8610627..303b65f 100644 --- a/cmds/sensorservice/main_sensorservice.cpp +++ b/services/sensorservice/main_sensorservice.cpp @@ -15,7 +15,7 @@ */ #include <binder/BinderService.h> -#include <SensorService.h> +#include "SensorService.h" using namespace android; diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk index bb0a2f9..8dbb9c5 100644 --- a/services/surfaceflinger/Android.mk +++ b/services/surfaceflinger/Android.mk @@ -65,6 +65,22 @@ LOCAL_MODULE:= libsurfaceflinger include $(BUILD_SHARED_LIBRARY) ############################################################### +# build surfaceflinger's executable +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + main_surfaceflinger.cpp + +LOCAL_SHARED_LIBRARIES := \ + libsurfaceflinger \ + libbinder \ + libutils + +LOCAL_MODULE:= surfaceflinger + +include $(BUILD_EXECUTABLE) + +############################################################### # uses jni which may not be available in PDK ifneq ($(wildcard libnativehelper/include),) include $(CLEAR_VARS) diff --git a/cmds/surfaceflinger/main_surfaceflinger.cpp b/services/surfaceflinger/main_surfaceflinger.cpp index ce7fde0..8503d4e 100644 --- a/cmds/surfaceflinger/main_surfaceflinger.cpp +++ b/services/surfaceflinger/main_surfaceflinger.cpp @@ -15,7 +15,7 @@ */ #include <binder/BinderService.h> -#include <SurfaceFlinger.h> +#include "SurfaceFlinger.h" using namespace android; |