From 8e8a67896de96915ca989462d44b4e0a8850230b Mon Sep 17 00:00:00 2001 From: "Erez A. Korn" Date: Sun, 12 Aug 2012 08:33:59 +0300 Subject: [PATCH] Allow buildtype user The tools scripts did not handle buildtype user correctly. Change-Id: Ie4f98dbab7e97a8244ee1d9b4d995673e0aac930 --- tools/opticharger | 2 ++ tools/squisher | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tools/opticharger b/tools/opticharger index 33489d86..1207b6ba 100755 --- a/tools/opticharger +++ b/tools/opticharger @@ -32,6 +32,8 @@ if [ "$APKCERTS" = "" ]; then if [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then TARGET_BUILD_VARIANT="eng" + elif [ "$TARGET_BUILD_VARIANT" = "user" ]; then + TARGET_BUILD_VARIANT="eng" fi APKCERTS=$OUT/obj/PACKAGING/target_files_intermediates/$TARGET_PRODUCT-target_files-$TARGET_BUILD_VARIANT.$USER/META/apkcerts.txt diff --git a/tools/squisher b/tools/squisher index 250a248d..ce94537e 100755 --- a/tools/squisher +++ b/tools/squisher @@ -27,6 +27,8 @@ if [ "$TARGET_BUILD_TYPE" = "debug" ]; then OTAPACKAGE=$OUT/${TARGET_PRODUCT}_debug-ota-$TARGET_BUILD_VARIANT.$USER.zip elif [ "$TARGET_BUILD_VARIANT" = "userdebug" ]; then OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-eng.$USER.zip +elif [ "$TARGET_BUILD_VARIANT" = "user" ]; then + OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-eng.$USER.zip else OTAPACKAGE=$OUT/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip fi