Merge pull request #1 from fatseng/b2g-5.1.1_r15

Bug 1221899 - configure device-asus-fugu

BoardConfig.mk

@@ -31,6 +31,7 @@ TARGET_BOARD_PLATFORM := moorefield
 TARGET_BOOTLOADER_BOARD_NAME := fugu
 TARGET_USERIMAGES_USE_EXT4 := true
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1073741824
+BOARD_USERDATAIMAGE_PARTITION_SIZE := 6393129984
 BOARD_FLASH_BLOCK_SIZE := 2048
 
 TARGET_DROIDBOOT_LIBS := libintel_droidboot
@@ -153,8 +154,8 @@ INTEL_DPST := true
 # bootstub as 2nd bootloader
 TARGET_BOOTLOADER_IS_2ND := true
 
-BOARD_SEPOLICY_DIRS := device/asus/fugu/sepolicy
-BOARD_SEPOLICY_UNION := \
+BOARD_SEPOLICY_DIRS += device/asus/fugu/sepolicy
+BOARD_SEPOLICY_UNION += \
     bluetooth.te \
     btfwloader.te \
     dhcp.te \

blob-shasums

@@ -0,0 +1,5 @@
+e3196589aed8e60dcb2ec5b144afa4d8267bb969 ?asus-fugu-lmy48n-e74605c6.tgz
+647ee127e7dfb97d7694d5ea9babcb5f6b3ffc72 ?broadcom-fugu-lmy48n-2c39322a.tgz
+022b2a08cf2d443c0b71371e048fa7d7206ffe0e ?google-fugu-lmy48n-439f1e1d.tgz
+6ec9fa8936cca3d607f2e24197c62eadbed29dfe ?intel-fugu-lmy48n-2ff81e02.tgz
+d8708928eafb9875b8f9b86e8153e9bea3e6523a ?widevine-fugu-lmy48n-0ce6d0a9.tgz

device.mk

@@ -244,7 +244,14 @@ PRODUCT_COPY_FILES += \
     device/asus/fugu/init.fugu.diag.rc.userdebug:root/init.fugu.diag.rc
 endif
 
-$(call inherit-product-if-exists, vendor/asus/fugu/device-vendor.mk)
+#$(call inherit-product-if-exists, vendor/asus/fugu/device-vendor.mk)
+LOCAL_STEM := fugu/device-partial.mk
+$(call inherit-product-if-exists, vendor/asus/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/google/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/intel/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/widevine/$(LOCAL_STEM))
+
 $(call inherit-product-if-exists, vendor/intel/PRIVATE/fugu/device-vendor.mk)
 $(call inherit-product-if-exists, vendor/intel/moorefield/prebuilts/houdini/houdini.mk)
 
@@ -256,3 +263,9 @@ PRODUCT_COPY_FILES += \
     device/asus/fugu/sep_policy.conf:system/etc/security/sep_policy.conf
 
 #PRODUCT_CHARACTERISTICS := tablet
+
+# for Gecko
+
+PRODUCT_COPY_FILES += \
+    device/asus/fugu/volume.cfg:system/etc/volume.cfg
+

download-blobs.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Mozilla Foundation
+#
+# 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.
+
+EXTRACT_RC="$PWD/extract.rc"
+
+install_blobs() {
+    mkdir -p download-$1 ||
+    exit 1
+    (cd download-$1 && shasum -p -c $3) ||
+    for BLOB in $2 ; do
+        rm -f download-$1/$BLOB &&
+        curl https://dl.google.com/dl/android/aosp/$BLOB -o download-$1/$BLOB ||
+        exit 1
+    done
+    (cd download-$1 && shasum -p -c $3) &&
+    for BLOB in $2 ; do
+        tar xvfz download-$1/$BLOB -C download-$1 ||
+        exit 1
+    done
+    for BLOB_SH in download-$1/extract-*.sh ; do
+        BASH_ENV="$EXTRACT_RC" bash $BLOB_SH
+    done
+}
+
+SHAMU_BLOBS=`cat $PWD/blob-shasums | cut -d '?' -f 2`
+
+CSUM_LIST="$PWD/blob-shasums"
+
+cd ../../.. &&
+install_blobs nexusplayer "$SHAMU_BLOBS" "$CSUM_LIST"

extract.rc

@@ -0,0 +1,9 @@
+
+more() {
+	return 0
+}
+
+read() {
+	typed="I ACCEPT"
+}
+

full_fugu.mk

@@ -21,3 +21,16 @@ PRODUCT_DEVICE := fugu
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := fugu
 PRODUCT_MANUFACTURER := ASUS
+
+# for Gecko
+
+TARGET_DEVICE_BLOBS := vendor/intel/fugu/device-partial.mk \
+                       vendor/broadcom/fugu/device-partial.mk \
+                       vendor/google/fugu/device-partial.mk \
+                       vendor/widevine/fugu/device-partial.mk \
+                       vendor/asus/fugu/device-partial.mk
+
+# Add GAIA flag to support TV distribution
+GAIA_DEVICE_TYPE := tv
+
+

volume.cfg

@@ -0,0 +1 @@
+create sdcard /storage/emulated/legacy