Merge "Revert "Override healthd HAL"" into mm6.0mm6.0

4 files changed, 0 insertions, 153 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 628a28b..92d22b2 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -81,9 +81,6 @@ ifneq ($(HAVE_NVIDIA_PROP_SRC),false)
 -include vendor/nvidia/build/definitions.mk
 endif
 
-# Override healthd HAL
-BOARD_HAL_STATIC_LIBRARIES := libhealthd.tegra3
-
 # Avoid the generation of ldrcc instructions
 NEED_WORKAROUND_CORTEX_A9_745320 := true
 
diff --git a/BoardConfigCommon.mk.orig b/BoardConfigCommon.mk.orig
deleted file mode 100644
index 237074f..0000000
--- a/BoardConfigCommon.mk.orig
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (C) 2010 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.
-
-#
-# This file sets variables that control the way modules are built
-# thorughout the system. It should not be used to conditionally
-# disable makefiles (the proper mechanism to control what gets
-# included in a build is to use PRODUCT_PACKAGES in a product
-# definition file).
-#
-
-# inherit from the proprietary version
-# needed for BP-flashing updater extensions
-
-# Default value, if not overridden else where.
-BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/asus/grouper/bluetooth
-
-TARGET_BOARD_PLATFORM := tegra3
-TARGET_TEGRA_VERSION := t30
-
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-TARGET_CPU_SMP := true
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv7-a-neon
-TARGET_CPU_VARIANT := cortex-a9
-
-TARGET_USERIMAGES_USE_EXT4 := true
-
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 681574400
-# Disable journaling on system.img to save space.
-BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 6567231488
-BOARD_CACHEIMAGE_PARTITION_SIZE := 457179136
-BOARD_FLASH_BLOCK_SIZE := 4096
-
-# Wifi related defines
-BOARD_WPA_SUPPLICANT_DRIVER := NL80211
-WPA_SUPPLICANT_VERSION      := VER_0_8_X
-BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
-BOARD_HOSTAPD_DRIVER        := NL80211
-BOARD_HOSTAPD_PRIVATE_LIB   := lib_driver_cmd_bcmdhd
-BOARD_WLAN_DEVICE           := bcmdhd
-#WIFI_DRIVER_MODULE_PATH     := "/system/lib/modules/bcm4329.ko"
-WIFI_DRIVER_FW_PATH_PARAM   := "/sys/module/bcmdhd/parameters/firmware_path"
-WIFI_DRIVER_FW_PATH_STA     := "/vendor/firmware/fw_bcmdhd.bin"
-WIFI_DRIVER_FW_PATH_AP      := "/vendor/firmware/fw_bcmdhd_apsta.bin"
-
-TARGET_BOOTLOADER_BOARD_NAME := grouper
-
-BOARD_USES_GENERIC_AUDIO := false
-BOARD_USES_ALSA_AUDIO := false
-
-BOARD_USES_GENERIC_INVENSENSE := false
-
-BOARD_HAVE_BLUETOOTH := true
-BOARD_HAVE_BLUETOOTH_BCM := true
-
-USE_OPENGL_RENDERER := true
-
-ifneq ($(HAVE_NVIDIA_PROP_SRC),false)
-# needed for source compilation of nvidia libraries
--include vendor/nvidia/proprietary_src/build/definitions.mk
--include vendor/nvidia/build/definitions.mk
-endif
-
-# Avoid the generation of ldrcc instructions
-NEED_WORKAROUND_CORTEX_A9_745320 := true
-
-BOARD_USES_GROUPER_MODULES := true
-
-BOARD_KERNEL_CMDLINE := androidboot.hardware=$(TARGET_BOOTLOADER_BOARD_NAME)
-TARGET_KERNEL_CONFIG := tegra3_android_defconfig
-TARGET_KERNEL_SOURCE := kernel/asus/grouper
-
-TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := true
-
-BOARD_SEPOLICY_DIRS += device/asus/grouper/sepolicy
diff --git a/libhealthd/Android.mk b/libhealthd/Android.mk
deleted file mode 100644
index 99b0d8c..0000000
--- a/libhealthd/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-# Copyright (C) 2013 The CyanogenMod 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 := healthd_board_tegra3.cpp
-LOCAL_MODULE := libhealthd.tegra3
-LOCAL_C_INCLUDES := system/core/healthd
-include $(BUILD_STATIC_LIBRARY)
diff --git a/libhealthd/healthd_board_tegra3.cpp b/libhealthd/healthd_board_tegra3.cpp
deleted file mode 100644
index 3a1f96d..0000000
--- a/libhealthd/healthd_board_tegra3.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- * Copyright (C) 2013 The CyanogenMod 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.
- */
-
-#include <healthd.h>
-
-void
-healthd_board_init(struct healthd_config *config)
-{
-    config->batteryCapacityPath    = android::String8("/sys/class/power_supply/battery/capacity");
-    config->batteryStatusPath      = android::String8("/sys/class/power_supply/battery/status");
-    config->batteryVoltagePath     = android::String8("/sys/class/power_supply/battery/voltage_now");
-    config->batteryCurrentNowPath  = android::String8("/sys/class/power_supply/battery/current_now");
-    config->batteryPresentPath     = android::String8("/sys/class/power_supply/battery/present");
-    config->batteryHealthPath      = android::String8("/sys/class/power_supply/battery/health");
-    config->batteryTemperaturePath = android::String8("/sys/class/power_supply/battery/temp");
-    config->batteryTechnologyPath  = android::String8("/sys/class/power_supply/battery/technology");
-    // others use defaults
-}
-
-int
-healthd_board_battery_update(struct android::BatteryProperties *props)
-{
-    // return 0 to log periodic polled battery status to kernel log
-    return 0;
-}