Revert "universal7580: support for building without the BSP"

This reverts commit cef8f06ef39c3bbac9b20ab5814e3abe1a49710d.

Change-Id: Icc6ea0d7ad78e36076f5c3b1c785a63a52fd1741

diff --git a/device-common.mk b/device-common.mk
index 41b0358e7d9455604d6f08a447b03dafcb4f3b65..590bf7424d0fa05be9216384c5eedb50fe26540c 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -200,10 +200,8 @@ PRODUCT_COPY_FILES += \
 -include $(LOCAL_PATH)/system_prop.mk
 
 # call Samsung LSI board support package
-ifneq ($(WITH_EXYNOS_BSP),)
 $(call inherit-product, hardware/samsung_slsi/exynos5/exynos5.mk)
 $(call inherit-product, hardware/samsung_slsi/exynos7580/exynos7580.mk)
-endif
 
 # call the proprietary setup
 $(call inherit-product, vendor/samsung/universal7580-common/universal7580-common-vendor.mk)

diff --git a/extract-files.sh b/extract-files.sh
index ce2672fe9831a4080c6ef1160b62ec84d8a1c5fa..944830a34fdc4ef90e1d502a7313a93e857da0b2 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -65,9 +65,6 @@ setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VEND
 extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \
         "${KANG}" --section "${SECTION}"
 
-extract "${MY_DIR}/proprietary-files-bsp.txt" "${SRC}" \
-        "${KANG}" --section "${SECTION}"
-
 # Fix proprietary blobs
 BLOB_ROOT="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary
 patchelf --replace-needed libgui.so libsensor.so $BLOB_ROOT/vendor/bin/gpsd

diff --git a/proprietary-files-bsp.txt b/proprietary-files-bsp.txt
deleted file mode 100644 (file)
index ec6cf20..0000000
--- a/proprietary-files-bsp.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# Graphics
-lib/hw/gralloc.exynos5.so
-lib/hw/hwcomposer.exynos5.so
-lib/hw/memtrack.exynos5.so
-lib/libcsc.so
-lib/libexynosdisplay.so
-lib/libexynosscaler.so
-lib/libexynosgscaler.so
-lib/libexynosutils.so
-lib/libexynosv4l2.so
-lib/libfimg.so
-lib/libhdmi.so
-lib/libhwcutils.so
-lib/libmpp.so
-
-# Mobicore
-bin/mcDriverDaemon:vendor/bin/mcDriverDaemon
-lib/libMcClient.so
-lib/libMcRegistry.so
-
-# OMX
-lib/libExynosOMX_Core.so
-lib/libExynosOMX_Resourcemanager.so
-lib/libstagefrighthw.so
-lib/omx/libOMX.Exynos.AVC.Decoder.so
-lib/omx/libOMX.Exynos.AVC.Encoder.so
-lib/omx/libOMX.Exynos.MPEG4.Decoder.so
-lib/omx/libOMX.Exynos.MPEG4.Encoder.so
-lib/omx/libOMX.Exynos.VP8.Decoder.so
-lib/omx/libOMX.Exynos.VP8.Encoder.so
-lib/omx/libOMX.Exynos.HEVC.Decoder.so
-lib/omx/libOMX.Exynos.HEVC.Encoder.so
-lib/omx/libOMX.Exynos.MPEG2.Decoder.so
-lib/omx/libOMX.Exynos.VP9.Decoder.so
-

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index dc123d9f335f3ed1f2a38068797b73aa7d3720c9..8d53f771f538dcea6cf345445acd6b50eef95b3e 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -44,16 +44,6 @@ write_headers "a3xelte a5xelte a7xelte gvwifi gvlte j7elte s5neolte"
 # The standard blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt" true
 
-# The BSP blobs - we put a conditional in case the BSP
-# is actually being built
-printf '\n%s\n' 'ifeq ($(WITH_EXYNOS_BSP),)' >> "$PRODUCTMK"
-printf '\n%s\n' 'ifeq ($(WITH_EXYNOS_BSP),)' >> "$ANDROIDMK"
-
-write_makefiles "$MY_DIR"/proprietary-files-bsp.txt
-
-printf '%s\n' 'endif' >> "$PRODUCTMK"
-printf '%s\n' 'endif' >> "$ANDROIDMK"
-
 ###################################################################################################
 # CUSTOM PART START                                                                               #
 ###################################################################################################