tank: move apks to vendor

extract-files.sh

@@ -1,49 +1,58 @@
 #!/bin/bash
 
-VENDOR=amazon
-DEVICE=tank
+export VENDOR=amazon
+export DEVICE_VENDOR=amazon
+export DEVICE=tank
 
+# Check to see if the user passed a folder in to extract from rather than adb pull
 if [ $# -eq 1 ]; then
     COPY_FROM=$1
     test ! -d "$COPY_FROM" && echo error reading dir "$COPY_FROM" && exit 1
 fi
 
-test -z "$DEVICE" && echo device not set && exit 2
-test -z "$VENDOR" && echo vendor not set && exit 2
-test -z "$VENDORDEVICEDIR" && VENDORDEVICEDIR=$DEVICE
-export VENDORDEVICEDIR
+set -e
 
-BASE=../../../vendor/$VENDOR/$VENDORDEVICEDIR/proprietary
-rm -rf $BASE/*
-
-for FILE in `egrep -v '(^#|^$)' ../$DEVICE/proprietary-files.txt`; do
-    echo "Extracting /system/$FILE ..."
-    OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS
-    FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"`
-    DEST=${PARSING_ARRAY[1]}
-    if [ -z $DEST ]
-    then
-        DEST=$FILE
-    fi
-    DIR=`dirname $FILE`
-    if [ ! -d $BASE/$DIR ]; then
-        mkdir -p $BASE/$DIR
-    fi
-    if [ "$COPY_FROM" = "" ]; then
-        adb pull /system/$FILE $BASE/$DEST
-        # if file dot not exist try destination
-        if [ "$?" != "0" ]
-          then
-          adb pull /system/$DEST $BASE/$DEST
+function extract() {
+    for FILE in `egrep -v '(^#|^$)' $1`; do
+        echo "Extracting /system/$FILE ..."
+        OLDIFS=$IFS IFS=":" PARSING_ARRAY=($FILE) IFS=$OLDIFS
+        FILE=`echo ${PARSING_ARRAY[0]} | sed -e "s/^-//g"`
+        DEST=${PARSING_ARRAY[1]}
+        if [ -z $DEST ]; then
+            DEST=$FILE
+        fi
+        DIR=`dirname $FILE`
+        if [ ! -d $2/$DIR ]; then
+            mkdir -p $2/$DIR
         fi
-    else
-        cp $COPY_FROM/$FILE $BASE/$DEST
-        # if file does not exist try destination
-        if [ "$?" != "0" ]
-            then
-            cp $COPY_FROM/$DEST $BASE/$DEST
+        if [ "$COPY_FROM" = "" ]; then
+            # Try destination target first
+            if [ -f /system/$DEST ]; then
+                adb pull /system/$DEST $2/$DEST
+            else
+                # if file does not exist try OEM target
+                if [ "$?" != "0" ]; then
+                    adb pull /system/$FILE $2/$DEST
+                fi
+            fi
+        else
+            # Try destination target first
+            if [ -f $COPY_FROM/$DEST ]; then
+                cp $COPY_FROM/$DEST $2/$DEST
+            else
+                # if file does not exist try OEM target
+                if [ "$?" != "0" ]; then
+                    cp $COPY_FROM/$FILE $2/$DEST
+                fi
+            fi
         fi
-    fi
-done
+    done
+}
+
+DEVICE_BASE=../../../vendor/$VENDOR/$DEVICE/proprietary
+rm -rf $DEVICE_BASE/*
+
+# Extract the device specific files
+extract ../../$DEVICE_VENDOR/$DEVICE/proprietary-files.txt $DEVICE_BASE
 
 ./setup-makefiles.sh

full_tank.mk

@@ -107,13 +107,6 @@ PRODUCT_PACKAGES += \
     TvProvider \
     TvSettings \
     tv_input.default \
-    LeanbackLauncher \
-    LeanbackIme \
-    Overscan \
-    TV \
-    RemoteControlService \
-    AtvRemoteService \
-    GlobalKeyInterceptor \
     AppDrawer
 
 # Enable frame-exact AV sync
@@ -217,4 +210,4 @@ $(call inherit-product, frameworks/native/build/tablet-7in-hdpi-1024-dalvik-heap
 $(call inherit-product-if-exists, frameworks/native/build/phone-xxhdpi-2048-hwui-memory.mk)
 
 # Get non-open-source specific aspects
-$(call inherit-product-if-exists, vendor/amazon/tank/tank-vendor.mk)
+$(call inherit-product-if-exists, vendor/amazon/tank/device-vendor.mk)

proprietary-files.txt

@@ -254,5 +254,13 @@ vendor/smartvolume/tank/dgtl_dock_headeset.csv
 vendor/smartvolume/tank/speaker.csv
 vendor/smartvolume/tank/wired_headphone.csv
 vendor/smartvolume/tank/wired_headset.csv
+-vendor/app/Ds/Ds.apk
 
-
+-priv-app/LeanbackLauncher/LeanbackLauncher.apk
+-priv-app/LeanbackIme/LeanbackIme.apk
+-priv-app/Overscan/Overscan.apk
+-priv-app/AtvRemoteService/AtvRemoteService.apk
+#-priv-app/GamepadPairingService/GamepadPairingService.apk
+-priv-app/GlobalKeyInterceptor/GlobalKeyInterceptor.apk
+-priv-app/RemoteControlService/RemoteControlService.apk
+-priv-app/TV/TV.apk