summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRockchip2015-03-11 11:27:44 +0800
committerRockchip2015-03-11 11:27:44 +0800
commit0ef75ea1fc979b5160a752175fdac16a4466a950 (patch)
tree9420ce9a70cd85222769d2eb8306660185be14ce
parent2c2ee4f25f4d2d89b1e55c21c54cb583defc0d86 (diff)
parent771b791a68eb8bbbdae5d0dc0fed98c9ff168d20 (diff)
Android 5.1.0 release 1
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlT0jyAACgkQ6K0/gZqxDnjpSgCfeOZhpJ+RjhtyS3FmO+8UkAUe 4s8AnR0A8w2BWTXwGtUL5aT8o1h1E7mO =Sopf -----END PGP SIGNATURE----- Merge tag 'android-5.1.0_r1' into android-5.0.2_r1 Android 5.1.0 release 1
-rwxr-xr-xgenerate-packages.sh18
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