From c6c3e249eddd5339dddd2bf3d26241ce8725c282 Mon Sep 17 00:00:00 2001 From: therootlord Date: Thu, 16 Aug 2018 15:58:32 -0300 Subject: [PATCH] sanders: remove 32b sensorservice/hal from build * Switched to 64b sensors --- device.mk | 3 +- sensorservice/Android.mk | 23 -------------- sensorservice/sensorservice.rc | 3 -- sensorservice_hal/Android.mk | 24 -------------- ...android.hardware.sensors@1.0-service_32.rc | 5 --- sensorservice_hal/service.cpp | 31 ------------------- vendor_prop.mk | 4 --- 7 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 sensorservice/Android.mk delete mode 100644 sensorservice/sensorservice.rc delete mode 100644 sensorservice_hal/Android.mk delete mode 100644 sensorservice_hal/android.hardware.sensors@1.0-service_32.rc delete mode 100644 sensorservice_hal/service.cpp diff --git a/device.mk b/device.mk index 1198efd..f0e0682 100644 --- a/device.mk +++ b/device.mk @@ -379,8 +379,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ android.hardware.sensors@1.0-impl \ - android.hardware.sensors@1.0-service_32 \ - sensorservice_32 + android.hardware.sensors@1.0-service # Thermal PRODUCT_COPY_FILES += \ diff --git a/sensorservice/Android.mk b/sensorservice/Android.mk deleted file mode 100644 index d9e850e..0000000 --- a/sensorservice/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= \ - ../../../../frameworks/native/services/sensorservice/main_sensorservice.cpp - -LOCAL_SHARED_LIBRARIES := \ - libsensorservice \ - libbinder \ - libutils - -LOCAL_CFLAGS := -Wall -Werror -Wextra - -LOCAL_MODULE_TAGS := optional - -LOCAL_MODULE:= sensorservice_32 - -LOCAL_32_BIT_ONLY := true -LOCAL_INIT_RC := sensorservice.rc -LOCAL_PROPRIETARY_MODULE := true - -include $(BUILD_EXECUTABLE) diff --git a/sensorservice/sensorservice.rc b/sensorservice/sensorservice.rc deleted file mode 100644 index d2749de..0000000 --- a/sensorservice/sensorservice.rc +++ /dev/null @@ -1,3 +0,0 @@ -service sensorservice /vendor/bin/sensorservice_32 - class main - user root diff --git a/sensorservice_hal/Android.mk b/sensorservice_hal/Android.mk deleted file mode 100644 index d1b8604..0000000 --- a/sensorservice_hal/Android.mk +++ /dev/null @@ -1,24 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_RELATIVE_PATH := hw -LOCAL_PROPRIETARY_MODULE := true -LOCAL_MODULE := android.hardware.sensors@1.0-service_32 -LOCAL_32_BIT_ONLY := true -LOCAL_INIT_RC := android.hardware.sensors@1.0-service_32.rc -LOCAL_SRC_FILES := \ - service.cpp \ - -LOCAL_SHARED_LIBRARIES := \ - liblog \ - libcutils \ - libdl \ - libbase \ - libutils \ - -LOCAL_SHARED_LIBRARIES += \ - libhidlbase \ - libhidltransport \ - android.hardware.sensors@1.0 \ - -include $(BUILD_EXECUTABLE) diff --git a/sensorservice_hal/android.hardware.sensors@1.0-service_32.rc b/sensorservice_hal/android.hardware.sensors@1.0-service_32.rc deleted file mode 100644 index 1ff0e3e..0000000 --- a/sensorservice_hal/android.hardware.sensors@1.0-service_32.rc +++ /dev/null @@ -1,5 +0,0 @@ -service sensors-hal-1-0 /vendor/bin/hw/android.hardware.sensors@1.0-service_32 - class hal - user system - group system input wakelock - capabilities BLOCK_SUSPEND SYS_NICE diff --git a/sensorservice_hal/service.cpp b/sensorservice_hal/service.cpp deleted file mode 100644 index 65f6d81..0000000 --- a/sensorservice_hal/service.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2016 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. - */ - -#define LOG_TAG "android.hardware.sensors@1.0-service" - -#include -#include - -using android::hardware::sensors::V1_0::ISensors; -using android::hardware::defaultPassthroughServiceImplementation; - -int main() { - /* Sensors framework service needs at least two threads. - * One thread blocks on a "poll" - * The second thread is needed for all other HAL methods. - */ - return defaultPassthroughServiceImplementation(2); -} diff --git a/vendor_prop.mk b/vendor_prop.mk index 5df65d3..4943a52 100644 --- a/vendor_prop.mk +++ b/vendor_prop.mk @@ -248,10 +248,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.hardware.sensors=sanders \ ro.mot.sensors.glance_approach=false -# SensorService -PRODUCT_PROPERTY_OVERRIDES += \ - system_init.startsensorservice=0 - #Trim properties PRODUCT_PROPERTY_OVERRIDES += \ ro.vendor.qti.sys.fw.trim_enable_memory=2147483648