Merge tag 'android-5.1.0_r1' of https://android.googlesource.com/device/common into cm-12.1staging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1

Android 5.1.0 release 1

1 files changed, 18 insertions, 0 deletions

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 @@ do
       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 @@ do
     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