From 67565fb3412764ce711cb00e1112fd4ff5ee5593 Mon Sep 17 00:00:00 2001 From: Andreas Blaesius Date: Fri, 18 Mar 2016 13:31:52 +0100 Subject: Update proprietary-files and scripts Change-Id: I81253dbab4b974ad35b64041f54e942c81ff35db --- extract-files.sh | 97 ++++++++++++++++++++++++++++++++++++++++++++------- proprietary-files.txt | 1 - 2 files changed, 85 insertions(+), 13 deletions(-) diff --git a/extract-files.sh b/extract-files.sh index 6956be2..53ee691 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright (C) 2016 The CyanogenMod Project +# Copyright (C) 2013 The CyanogenMod Project +# Copyright (C) 2015 SlimRoms # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,21 +15,93 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/common/generate-blob-scripts.sh - DO NOT EDIT - VENDOR=samsung -DEVICE=espresso3g -DEVICEBASE=../../../vendor/$VENDOR/$DEVICE +COMMON=espresso3g +COMMONOUTDIR=vendor/$VENDOR/$COMMON +COMMONBASE=../../../$COMMONOUTDIR/proprietary +COMMONMAKEFILE=../../../$COMMONOUTDIR/espresso3g-vendor-blobs.mk +COMMONPROPS=proprietary-files.txt + +mkdir -p ../../../vendor/$VENDOR/$COMMON/proprietary -echo "Pulling device specific files..." -for FILE in `cat proprietary-files.txt | grep -v ^# | grep -v ^$`; do +adb root +adb wait-for-device + +echo "Pulling common files..." +for FILE in `cat $COMMONPROPS | grep -v ^# | grep -v ^$`; do DIR=`dirname $FILE` - if [ ! -d $DEVICEBASE/$DIR ]; then - mkdir -p $DEVICEBASE/$DIR + if [ ! -d $COMMONBASE/$DIR ]; then + mkdir -p $COMMONBASE/$DIR fi - adb pull /$FILE $DEVICEBASE/$FILE + adb pull /$FILE $COMMONBASE/$FILE done -./setup-makefiles.sh -./../../../device/samsung/espresso-common/extract-files.sh +(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__VENDOR__/$VENDOR/g > $COMMONMAKEFILE +# Copyright (C) 2010 The Android Open Source 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. + +PRODUCT_COPY_FILES += \\ + \vendor/samsung/espresso3g/proprietary/sbin/cbd:root/sbin/cbd + +PRODUCT_COPY_FILES += \\ +EOF + +LINEEND=" \\" +COUNT=`cat $COMMONPROPS | grep -v ^# | grep -v ^$ | wc -l | awk {'print $1'}` +for FILE in `cat $COMMONPROPS | grep -v ^# | grep -v ^$`; do + COUNT=`expr $COUNT - 1` + if [ $COUNT = "0" ]; then + LINEEND="" + fi + echo " \vendor/samsung/espresso3g/proprietary/$FILE:$FILE$LINEEND" >> $COMMONMAKEFILE +done + + +(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__VENDOR__/$VENDOR/g > ../../../$COMMONOUTDIR/espresso3g-vendor.mk +# Copyright (C) 2010 The Android Open Source 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. + +\$(call inherit-product, vendor/__VENDOR__/__COMMON__/espresso3g-vendor-blobs.mk) +EOF + +(cat << EOF) | sed s/__COMMON__/$COMMON/g | sed s/__VENDOR__/$VENDOR/g > ../../../$COMMONOUTDIR/BoardConfigVendor.mk +# Copyright (C) 2010 The Android Open Source 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. + +EOF + +./../espresso/extract-files.sh diff --git a/proprietary-files.txt b/proprietary-files.txt index c9d5509..8c52283 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,3 +1,2 @@ sbin/cbd system/lib/libsec-ril.so -system/lib/libsecril-client.so -- cgit v1.1