espresso: cleanup

Change-Id: Ifd7aa36f0e01941f918db60d11d352163e113617

2 files changed, 3 insertions, 33 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index ef39a7b..e7cd5eb 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -18,7 +18,6 @@
 -include hardware/ti/omap4/BoardConfigCommon.mk
 
 TARGET_NO_BOOTLOADER := true
-TARGET_NO_RADIOIMAGE := true
 
 TARGET_BOARD_OMAP_CPU := 4430
 TARGET_BOOTLOADER_BOARD_NAME := piranha
@@ -42,10 +41,6 @@ SGX_MODULES:
 
 TARGET_KERNEL_MODULES += SGX_MODULES
 
-# Init
-TARGET_PROVIDES_INIT := true
-TARGET_PROVIDES_INIT_TARGET_RC := true
-
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_BOOTIMAGE_PARTITION_SIZE := 8388608
@@ -66,7 +61,6 @@ TARGET_USE_CUSTOM_LUN_FILE_PATH := "/sys/class/android_usb/f_mass_storage/lun%d/
 
 # Wifi
 BOARD_WLAN_DEVICE                := bcmdhd
-BOARD_WLAN_DEVICE_REV            := bcm4330_b1
 WPA_SUPPLICANT_VERSION           := VER_0_8_X
 BOARD_WPA_SUPPLICANT_DRIVER      := NL80211
 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd
@@ -96,21 +90,13 @@ BOARD_CHARGER_SHOW_PERCENTAGE := true
 # Liblights
 TARGET_PROVIDES_LIBLIGHT := true
 
-# Sensors
-BOARD_USE_LEGACY_SENSORS_FUSION := false
-
 # Selinux
 BOARD_SEPOLICY_DIRS += \
     device/samsung/espressowifi/sepolicy
 
 # Recovery
-TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
-BOARD_UMS_LUNFILE := "/sys/class/android_usb/f_mass_storage/lun0/file"
-BOARD_USES_MMCUTILS := true
-BOARD_HAS_NO_MISC_PARTITION := true
-BOARD_HAS_NO_SELECT_BUTTON := true
-BOARD_SUPPRESS_EMMC_WIPE := true
+RECOVERY_FSTAB_VERSION := 2
 TARGET_RECOVERY_FSTAB := device/samsung/espressowifi/rootdir/etc/fstab.tab2
+TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 TARGET_RECOVERY_DEVICE_DIRS += device/samsung/espressowifi
-RECOVERY_FSTAB_VERSION := 2
 BOARD_HAS_DOWNLOAD_MODE := true
diff --git a/espresso-common.mk b/espresso-common.mk
index 3026318..4017c18 100644
--- a/espresso-common.mk
+++ b/espresso-common.mk
@@ -19,14 +19,10 @@ $(call inherit-product, hardware/ti/omap4/omap4.mk)
 
 DEVICE_PACKAGE_OVERLAYS += device/samsung/espressowifi/overlay/aosp-common
 
-$(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
-
 LOCAL_PATH := device/samsung/espressowifi
 
-# Enable higher-res drawables while keeping mdpi as primary source
 PRODUCT_AAPT_CONFIG := large
 PRODUCT_AAPT_PREF_CONFIG := mdpi
-PRODUCT_LOCALES += mdpi
 
 # Ramdisk
 PRODUCT_PACKAGES += \
@@ -61,8 +57,7 @@ PRODUCT_PACKAGES += \
     wpa_supplicant.conf
 
 PRODUCT_PROPERTY_OVERRIDES += \
-    wifi.interface=wlan0 \
-    wifi.supplicant_scan_interval=15
+    wifi.interface=wlan0
 
 # Bluetooth
 PRODUCT_COPY_FILES += \
@@ -106,7 +101,6 @@ PRODUCT_PACKAGES += \
 
 # Charger
 PRODUCT_PACKAGES += \
-    charger \
     charger_res_images
 
 # Samsung dock keyboard
@@ -136,14 +130,6 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_CHARACTERISTICS := tablet
 
-PRODUCT_PACKAGES += \
-    librs_jni \
-    com.android.future.usb.accessory
-
-# Feature live wallpaper
-PRODUCT_COPY_FILES += \
-    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:system/etc/permissions/android.software.live_wallpaper.xml
-
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.opengles.version=131072 \
     ro.bq.gpu_to_cpu_unsupported=1 \
@@ -152,8 +138,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.dex2oat-flags=--no-watch-dog
 
-PRODUCT_TAGS += dalvik.gc.type-precise
-
 $(call inherit-product-if-exists, vendor/samsung/espresso-common/espresso-common-vendor.mk)
 $(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk)
 $(call inherit-product-if-exists, hardware/broadcom/wlan/bcmdhd/firmware/bcm4330/device-bcm.mk)