P5100: move some more parts to espresso-common (4/5)

- we share one kernel source
- get rid of BoardConfigCommon.mk in p3100/p5100 trees
- get rid of p31xx/p51xx-common.mk
- move common proprietary list

Change-Id: Id6e770e58ec0c1939a69443ce1e0008c03a1c51d

7 files changed, 11 insertions, 105 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index b50d437..92563c8 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -14,14 +14,16 @@
 # limitations under the License.
 #
 
-# Include p51xx BoardConfigCommon
--include device/samsung/p5100/BoardConfigCommon.mk
+# Include common espresso BoardConfig
+-include device/samsung/espresso-common/BoardConfigCommon.mk
 
 TARGET_BOARD_INFO_FILE := device/samsung/p5100/board-info.txt
 
 # Inline kernel building
-TARGET_KERNEL_SOURCE := kernel/samsung/espresso10
 TARGET_KERNEL_CONFIG := cyanogenmod_p5100_defconfig
 
 # assert
 TARGET_OTA_ASSERT_DEVICE := p5100,GT-P5100,espresso10rf,espresso10rfxx
+
+# Use the non-open-source parts, if they're present
+-include vendor/samsung/p51xx/BoardConfigVendor.mk
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
deleted file mode 100644
index 9cb654d..0000000
--- a/BoardConfigCommon.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (C) 2015 SlimRoms
-# Copyright (C) 2012 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.
-#
-
-# This variable is set first, so it can be overridden
-# by BoardConfigVendor.mk
-
--include device/samsung/espresso-common/BoardConfigCommon.mk
-
-# Use the non-open-source parts, if they're present
--include vendor/samsung/p51xx/BoardConfigVendor.mk
diff --git a/extract-files.sh b/extract-files.sh
index dea73ab..a11eaf3 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -23,7 +23,7 @@ COMMONBASE=../../../vendor/$VENDOR/$COMMON/common
 DEVICEBASE=../../../vendor/$VENDOR/$COMMON/$DEVICE
 
 echo "Pulling common files..."
-for FILE in `cat proprietary-common-files.txt | grep -v ^# | grep -v ^$`; do
+for FILE in `cat ../espresso-common/proprietary-p51xx-files.txt | grep -v ^# | grep -v ^$`; do
     DIR=`dirname $FILE`
     if [ ! -d $COMMONBASE/$DIR ]; then
         mkdir -p $COMMONBASE/$DIR
diff --git a/p5100.mk b/p5100.mk
index 9e85164..8f1c7e8 100644
--- a/p5100.mk
+++ b/p5100.mk
@@ -14,7 +14,8 @@
 # limitations under the License.
 #
 
-$(call inherit-product, device/samsung/p5100/p51xx-common.mk)
+# Include espresso-common makefile
+$(call inherit-product, device/samsung/espresso-common/espresso-common.mk)
 
 LOCAL_PATH := device/samsung/p5100
 
@@ -41,3 +42,4 @@ PRODUCT_COPY_FILES += \
 
 # Use the non-open-source parts, if they're present
 $(call inherit-product-if-exists, vendor/samsung/p51xx/p5100-vendor.mk)
+$(call inherit-product-if-exists, vendor/samsung/p51xx/p51xx-vendor.mk)
diff --git a/p51xx-common.mk b/p51xx-common.mk
deleted file mode 100755
index 31cbf50..0000000
--- a/p51xx-common.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2012 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 espresso-common makefile
-$(call inherit-product, device/samsung/espresso-common/espresso-common.mk)
-
-LOCAL_PATH := device/samsung/p5100
-
-# 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 += \
-    fstab.espresso \
-    fstab.espresso10 \
-    init.espresso10.usb.rc \
-    init.espresso10.rc \
-    ueventd.espresso10.rc
-
-$(call inherit-product-if-exists, vendor/samsung/p51xx/p51xx-vendor.mk)
diff --git a/proprietary-common-files.txt b/proprietary-common-files.txt
deleted file mode 100644
index c3eebbf..0000000
--- a/proprietary-common-files.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-system/bin/bintvoutservice
-system/bin/geomagneticd
-system/bin/gpsd
-system/bin/orientationd
-system/bin/smc.ini
-system/bin/smc_pa.ift
-system/etc/wifi/bcmdhd_apsta.bin
-system/etc/wifi/bcmdhd_mfg.bin
-system/etc/wifi/bcmdhd_p2p.bin
-system/etc/wifi/bcmdhd_sta.bin
-system/etc/wifi/nvram_mfg.txt
-system/etc/wifi/nvram_net.txt
-system/lib/hw/vendor-camera.piranha.so
-system/lib/hw/gps.omap4.so
-system/lib/hw/sensors.omap4.so
-system/lib/libdomx.so
-system/lib/libhdcp.so
-system/lib/libI420colorconvert.so
-system/lib/libion.omap4.so
-system/lib/libmm_osal.so
-system/lib/libOMX.TI.DUCATI1.MISC.SAMPLE.so
-system/lib/libOMX.TI.DUCATI1.VIDEO.CAMERA.so
-system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.secure.so
-system/lib/libOMX.TI.DUCATI1.VIDEO.DECODER.so
-system/lib/libOMX.TI.DUCATI1.VIDEO.H264E.so
-system/lib/libOMX.TI.DUCATI1.VIDEO.MPEG4E.so
-system/lib/libOMX_Core.so
-system/lib/libQmageDecoder.so
-system/lib/libsecnativefeature.so
-system/lib/libtvoutinterface.so
-system/lib/libtvout_jni.so
-system/lib/libtvoutservice.so
-system/lib/libtiutils.so
-system/vendor/firmware/BCM4330.hcd
-system/vendor/firmware/ducati-m3.bin
-system/vendor/lib/drm/libdrmwvmplugin.so
-system/vendor/lib/libWVStreamControlAPI_L1.so
-system/vendor/lib/libwvdrm_L1.so
-system/vendor/lib/libwvm.so
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 00a2453..2bebe60 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -44,8 +44,8 @@ PRODUCT_COPY_FILES += \\
 EOF
 
 LINEEND=" \\"
-COUNT=`cat proprietary-common-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}`
-for FILE in `cat proprietary-common-files.txt | grep -v ^# | grep -v ^$`; do
+COUNT=`cat ../espresso-common/proprietary-p51xx-files.txt | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}`
+for FILE in `cat ../espresso-common/proprietary-p51xx-files.txt | grep -v ^# | grep -v ^$`; do
     COUNT=`expr $COUNT - 1`
     if [ $COUNT = "0" ]; then
         LINEEND=""