flo: commonize blobs with deb

Change-Id: Iabcb78830ead89822aba8a4505acb1ab400873fe

BoardConfig.mk

@@ -24,5 +24,4 @@ TARGET_RELEASETOOLS_EXTENSIONS := device/asus/flo
 
 TARGET_RECOVERY_FSTAB = device/asus/flo/fstab.flo
 
--include vendor/asus/flo/BoardConfigVendor.mk
 include device/asus/flo/BoardConfigCommon.mk

BoardConfigCommon.mk

@@ -129,3 +129,5 @@ BOARD_HARDWARE_CLASS += \
 
 # Recovery
 TARGET_RECOVERY_DENSITY := hdpi
+
+-include vendor/asus/flo/BoardConfigVendor.mk

aosp_flo.mk

@@ -29,5 +29,4 @@ PRODUCT_MANUFACTURER := ASUS
 
 # Inherit from hardware-specific part of the product configuration
 $(call inherit-product, device/asus/flo/device.mk)
-$(call inherit-product-if-exists, vendor/asus/flo/device-vendor.mk)
 #$(call inherit-product-if-exists, vendor/qcom/proprietary/common/config/device-vendor.mk)

device-common.mk

@@ -18,6 +18,7 @@
 # are also specific to msm8960 devices
 #
 # Everything in this directory will become public
+$(call inherit-product-if-exists, vendor/asus/flo/flo-vendor.mk)
 
 # This device is xhdpi.  However the platform doesn't
 # currently contain all of the bitmaps at xhdpi density so

device.mk

@@ -18,7 +18,6 @@
 # are also specific to msm8960 devices
 #
 # Everything in this directory will become public
-$(call inherit-product-if-exists, vendor/asus/flo/flo-vendor.mk)
 
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.carrier=wifi-only
@@ -37,7 +36,4 @@ PRODUCT_PACKAGES += \
 # the actual meat of the device-specific product definition
 $(call inherit-product, device/asus/flo/device-common.mk)
 
-# inherit from the non-open-source side, if present
-$(call inherit-product-if-exists, vendor/asus/flo/device-vendor.mk)
-
 DEVICE_PACKAGE_OVERLAYS := device/asus/flo/overlay

extract-files.sh

@@ -17,7 +17,8 @@
 set -e
 
 VENDOR=asus
-DEVICE=flo
+DEVICE_COMMON=flo
+DEVICE=${DEVICE:-flo}
 
 # Load extractutils and do some sanity checks
 MY_DIR="${BASH_SOURCE%/*}"
@@ -49,8 +50,15 @@ else
 fi
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
+setup_vendor "$DEVICE_COMMON" "$VENDOR" "$CM_ROOT" true
 
 extract "$MY_DIR"/proprietary-blobs.txt "$SRC"
 
+if [ "$DEVICE" '!=' "$DEVICE_COMMON" ]; then
+	# Reinitialize the helper for the device-specific blobs
+	setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
+
+	extract "$MY_DIR"/../$DEVICE/proprietary-blobs.txt "$SRC"
+fi
+
 "$MY_DIR"/setup-makefiles.sh

setup-makefiles.sh

@@ -17,7 +17,8 @@
 set -e
 
 VENDOR=asus
-DEVICE=flo
+DEVICE_COMMON=flo
+DEVICE=${DEVICE:-flo}
 
 # Load extractutils and do some sanity checks
 MY_DIR="${BASH_SOURCE%/*}"
@@ -33,13 +34,29 @@ fi
 . "$HELPER"
 
 # Initialize the helper
-setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
+setup_vendor "$DEVICE_COMMON" "$VENDOR" "$CM_ROOT" true
 
 # Copyright headers and guards
-write_headers
+write_headers "flo deb"
 
 # The standard blobs
 write_makefiles "$MY_DIR"/proprietary-blobs.txt
 
 # Done
 write_footers
+
+if [ "$DEVICE" '!=' "$DEVICE_COMMON" ]; then
+	# Reinitialize the helper for the device-specific blobs
+	setup_vendor "$DEVICE" "$VENDOR" "$CM_ROOT"
+
+	# Copyright headers and guards
+	write_headers
+
+	# The device-specific blobs
+	write_makefiles "$MY_DIR"/../$DEVICE/proprietary-blobs.txt
+
+	# Done
+	write_footers
+fi
+
+