commit 47df9b5446770d20ab450fffa1ab3efdce47a62a
author Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:21 2015 +0530
committer Shreyas Narayan <shrena@codeaurora.org> Sun Mar 15 02:09:21 2015 +0530
tree 49851c95905725b594b456033c452f1bf6a0ac86
parent b143878e855aff96d089c26e99f02879062bdc1b
parent 771b791a68eb8bbbdae5d0dc0fed98c9ff168d20

Merge tag android-5.1.0_r1 into AOSP_5.1_MERGE

Change-Id: Ie036d2d351eb2bab12d275657aafd637fc302df6

generate-packages.sh

diff --git a/generate-packages.sh b/generate-packages.sh
index 4857dea..f86693b 100755
--- a/generate-packages.sh
+++ b/generate-packages.sh
@@ -81,6 +81,12 @@
       echo "LOCAL_MODULE_CLASS := APPS" >> ${APK_MAKEFILE}
       echo "LOCAL_SRC_FILES := \$(LOCAL_MODULE).apk" >> ${APK_MAKEFILE}
       echo "LOCAL_CERTIFICATE := PRESIGNED" >> ${APK_MAKEFILE}
+
+      if [[ ${TMP_ONE_FILE_NAME} == "LeanbackLauncher" ]]
+      then
+        echo "LOCAL_OVERRIDES_PACKAGES := Launcher2" >> ${APK_MAKEFILE}
+      fi
+
       echo "include \$(BUILD_PREBUILT)" >> ${APK_MAKEFILE}
       echo "" >> ${APK_MAKEFILE}
     fi
@@ -91,6 +97,18 @@
     then
       chmod a+x $FILEDIR_NEW/$(basename $ONE_FILE) || echo \ \ \ \ Error chmoding $ONE_FILE
     fi
+
+    ONE_FILE_BASE=$(basename $ONE_FILE)
+    if [[ $ONE_FILE_BASE == *atmel-a432-*-shamu-p1.tdat ]]
+    then
+      ATMEL_FILE=$(ls $FILEDIR_NEW/$ONE_FILE_BASE | cut -f6 -d'/')
+      sed -i "s/$ONE_FILE_BASE/$ATMEL_FILE/" moto/staging/device-partial.mk
+    elif [[ $ONE_FILE_BASE == *atmel-a432-*-shamu.tdat ]]
+    then
+      ATMEL_FILE=$(ls $FILEDIR_NEW/$ONE_FILE_BASE | cut -f6 -d'/')
+      sed -i "s/$ONE_FILE_BASE/$ATMEL_FILE/" moto/staging/device-partial.mk
+    fi
+
   done
   echo \ \ Setting up $COMPANY-specific makefiles
   cp -R $COMPANY/staging/* tmp/vendor/$COMPANY/$DEVICE || echo \ \ \ \ Error copying makefiles