universal7580: support for building without the BSP

Change-Id: I9065695fccdbd414663fb7e9c02d62e22fdb22e8

universal7580: Drop incompatible license

Change-Id: I685a96ec1fe7c077e51b36c6dc4288819ac3665b

diff --git a/device-common.mk b/device-common.mk
index 89f4354aa877354a550f2331d7863f13e118ebc5..57802ff7c04944a724de613231c45c8fa764589e 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -182,8 +182,10 @@ 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 72867f266dca494bfb760611368ccaa6321eebbd..7c7edce6505b2c84de49925b573ba0ccaeafaf48 100755 (executable)
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -52,6 +52,7 @@ fi
 setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true
 
 extract "$MY_DIR"/proprietary-files.txt "$SRC"
+extract "$MY_DIR"/proprietary-files-bsp.txt "$SRC"
 
 BLOB_ROOT="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary
 

diff --git a/proprietary-files-bsp.txt b/proprietary-files-bsp.txt
new file mode 100644 (file)
index 0000000..eaf968a
--- /dev/null
+++ b/proprietary-files-bsp.txt
@@ -0,0 +1,24 @@
+# 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
+lib/libMcClient.so
+lib/libMcRegistry.so
+
+# OMX
+lib/libExynosOMX_Core.so
+lib/libExynosOMX_Resourcemanager.so
+lib/libstagefrighthw.so

diff --git a/proprietary-files.txt b/proprietary-files.txt
index ef998f23c778681716edeb975cf3d2747b1ef249..3372b20b75dc6b5beda02ae0915581e58e1ea1db 100644 (file)
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,12 +1,8 @@
 # Camera
-lib/libexynosv4l2.so
 lib/libhwjpeg.so
 lib/libuniplugin.so
 lib/libsensorlistener.so
 
-# Gralloc
-lib/hw/gralloc.exynos5.so
-
 # GPS
 bin/gpsd
 bin/gps.cer
@@ -16,9 +12,6 @@ lib/libfloatingfeature.so
 
 # Graphics
 vendor/lib/egl/libGLES_mali.so
-lib/libcsc.so
-lib/libexynosscaler.so
-lib/libexynosgscaler.so
 
 # Mobicore
 bin/cs
@@ -38,8 +31,6 @@ lib/omx/libOMX.Exynos.MPEG4.Encoder.so|371668ced35a70f327b3e723d774a14505cff341
 lib/omx/libOMX.Exynos.VP8.Decoder.so|338a089ac76e867eb795343dce4ee2b5326b0c77
 lib/omx/libOMX.Exynos.VP8.Encoder.so|2f13479cc28b6e3cfa92202326bc26e812a4f620
 lib/omx/libOMX.Exynos.WMV.Decoder.so|829ee8de0450615bf573c418d5205de3c33b50a1
-lib/libExynosOMX_Resourcemanager.so|d928a21d8a653d8ee40c9a609e86151a476d068e
-lib/libExynosOMX_Core.so
 
 # RIL
 lib/libsecnativefeature.so

diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 729c1149c20e87142fc18a48c388ddc47a98c9f7..9cbfc3b70588175c85f145e8609c8850db67bd55 100755 (executable)
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -41,6 +41,16 @@ 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                                                                               #
 ###################################################################################################