9 files changed, 10 insertions, 94 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index e198b9b..2927c72 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,14 +17,6 @@
 # Product-specific compile-time definitions.
 #
 
-# Set this up here so that BoardConfigVendor.mk can override it
-BOARD_USES_GENERIC_AUDIO := false
-
-BOARD_USES_LIBSECRIL_STUB := true
-
-BOARD_NO_PAGE_FLIPPING := true
-BOARD_NO_32BPP := true
-
 # Use the non-open-source parts, if they're present
 -include vendor/samsung/crespo/BoardConfigVendor.mk
 
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 1fd942f..bc9152f 100755
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -45,6 +45,7 @@ endif
 
 BOARD_USES_HGL := true
 ##BOARD_USES_OVERLAY := true
+BOARD_USES_GENERIC_AUDIO := false
 
 DEFAULT_FB_NUM := 2
 
diff --git a/device_base.mk b/device_base.mk
index 7b4255f..be538e3 100644
--- a/device_base.mk
+++ b/device_base.mk
@@ -125,6 +125,14 @@ PRODUCT_PACKAGES += \
         Nfc \
         Tag
 
+# Live Wallpapers
+PRODUCT_PACKAGES += \
+        LiveWallpapers \
+        LiveWallpapersPicker \
+        MagicSmokeWallpapers \
+        VisualizationWallpapers \
+        librs_jni
+
 # Input device calibration files
 PRODUCT_COPY_FILES += \
 	device/samsung/crespo/mxt224_ts_input.idc:system/usr/idc/mxt224_ts_input.idc
diff --git a/self-extractors/broadcom/staging/BoardConfigCrespo.mk b/self-extractors/broadcom/staging/BoardConfigCrespo.mk
index 870325e..01a0ff3 100644
--- a/self-extractors/broadcom/staging/BoardConfigCrespo.mk
+++ b/self-extractors/broadcom/staging/BoardConfigCrespo.mk
@@ -11,5 +11,3 @@
 # 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.
-
-BOARD_GPS_LIBRARIES := libgps
diff --git a/self-extractors/imgtec/staging/BoardConfigCrespo.mk b/self-extractors/imgtec/staging/BoardConfigCrespo.mk
index 5a85551..01a0ff3 100644
--- a/self-extractors/imgtec/staging/BoardConfigCrespo.mk
+++ b/self-extractors/imgtec/staging/BoardConfigCrespo.mk
@@ -11,6 +11,3 @@
 # 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.
-
-BOARD_NO_PAGE_FLIPPING := false
-BOARD_NO_32BPP := false
diff --git a/self-extractors/imgtec/staging/device-crespo.mk b/self-extractors/imgtec/staging/device-crespo.mk
index bcceee5..118a64a 100644
--- a/self-extractors/imgtec/staging/device-crespo.mk
+++ b/self-extractors/imgtec/staging/device-crespo.mk
@@ -12,21 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Live wallpaper packages
-PRODUCT_PACKAGES := \
-    LiveWallpapers \
-    LiveWallpapersPicker \
-    MagicSmokeWallpapers \
-    VisualizationWallpapers \
-    librs_jni
-
-# Publish that we support the live wallpaper feature.
-PRODUCT_COPY_FILES := \
-    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
-
-# Pick up overlay for features that depend on non-open-source files
-DEVICE_PACKAGE_OVERLAYS := vendor/imgtec/crespo/overlay
-
 # Imgtec blobs necessary for crespo
 PRODUCT_COPY_FILES += \
     vendor/imgtec/crespo/proprietary/pvrsrvinit:system/vendor/bin/pvrsrvinit \
diff --git a/self-extractors/nxp/staging/device-crespo.mk b/self-extractors/nxp/staging/device-crespo.mk
index 805d2b4..6e082d0 100644
--- a/self-extractors/nxp/staging/device-crespo.mk
+++ b/self-extractors/nxp/staging/device-crespo.mk
@@ -12,13 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# NXP blob necessary for crespo, and related open-source packages
+# NXP blob necessary for crespo
 PRODUCT_COPY_FILES := \
-    device/sample/nxp/com.nxp.mifare.xml:system/etc/permissions/com.nxp.mifare.xml \
     vendor/nxp/crespo/proprietary/libpn544_fw.so:system/lib/libpn544_fw.so
-
-PRODUCT_PACKAGES += \
-        libnfc \
-        libnfc_jni \
-        Nfc \
-        Tag
diff --git a/self-extractors/samsung/staging/BoardConfigCrespo.mk b/self-extractors/samsung/staging/BoardConfigCrespo.mk
index c3b33a3..01a0ff3 100644
--- a/self-extractors/samsung/staging/BoardConfigCrespo.mk
+++ b/self-extractors/samsung/staging/BoardConfigCrespo.mk
@@ -11,9 +11,3 @@
 # 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.
-
-USE_CAMERA_STUB := false
-
-BOARD_USES_GENERIC_AUDIO := false
-
-BOARD_USES_LIBSECRIL_STUB := false
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 916c1ea..cf06f2d 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -36,21 +36,6 @@ mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE
 
 # This file is generated by device/__MANUFACTURER__/__DEVICE__/setup-makefiles.sh
 
-# Live wallpaper packages
-PRODUCT_PACKAGES := \\
-    LiveWallpapers \\
-    LiveWallpapersPicker \\
-    MagicSmokeWallpapers \\
-    VisualizationWallpapers \\
-    librs_jni
-
-# Publish that we support the live wallpaper feature.
-PRODUCT_COPY_FILES := \\
-    packages/wallpapers/LivePicker/android.software.live_wallpaper.xml:/system/etc/permissions/android.software.live_wallpaper.xml
-
-# Pick up overlay for features that depend on non-open-source files
-DEVICE_PACKAGE_OVERLAYS := vendor/__MANUFACTURER__/__DEVICE__/overlay
-
 \$(call inherit-product, vendor/__MANUFACTURER__/__DEVICE__/device-vendor-blobs.mk)
 EOF
 
@@ -70,41 +55,4 @@ EOF
 # limitations under the License.
 
 # This file is generated by device/__MANUFACTURER__/__DEVICE__/setup-makefiles.sh
-
-BOARD_GPS_LIBRARIES := libgps
-
-USE_CAMERA_STUB := false
-
-BOARD_USES_GENERIC_AUDIO := false
-
-BOARD_USES_LIBSECRIL_STUB := false
-
-BOARD_NO_PAGE_FLIPPING := false
-BOARD_NO_32BPP := false
-EOF
-
-mkdir -p ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout
-(cat << EOF) | sed s/__DEVICE__/$DEVICE/g | sed s/__MANUFACTURER__/$MANUFACTURER/g > ../../../vendor/$MANUFACTURER/$DEVICE/overlay/packages/apps/Launcher2/res/layout/all_apps.xml
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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 is generated by device/__MANUFACTURER__/__DEVICE__/setup-makefiles.sh -->
-
-<!-- switch to all_apps_3d on devices that support RenderScript -->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include layout="@layout/all_apps_3d" />
-</merge>
 EOF