Allow buildtype user

The tools scripts did not handle buildtype user correctly. Change-Id: Ie4f98dbab7e97a8244ee1d9b4d995673e0aac930
12 years ago · 8e8a67896d
parent c8862ade99
commit 8e8a67896d
2 changed files with 4 additions and 0 deletions
--- 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
--- 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