From 671e046251f02685a1cf8b4b4dfa29172ae91b9f Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Tue, 1 Oct 2019 14:20:53 +0000
Subject: [PATCH] Bug 1379032 - Use -Oz as optimization flag on android/clang.
 r=froydnj

Due to https://github.com/android-ndk/ndk/issues/133#issuecomment-308549264 and bug 1163171 comment #14, we should use -Oz instead of -Os on Android/clang

MozReview-Commit-ID: 1T6fI87sa33

UltraBlame original commit: 29ef8a111035ecbfd1cc50bd2cab3435384ad0b0
---
 old-configure.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/old-configure.in b/old-configure.in
index a6e2bcf2657bc..eb6b8a54e0239 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -867,9 +867,12 @@ case "$target" in
     fi
 
     MOZ_GFX_OPTIMIZE_MOBILE=1
-    MOZ_OPTIMIZE_FLAGS="-Os"
     if test -z "$CLANG_CC"; then
-       MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions $MOZ_OPTIMIZE_FLAGS"
+        MOZ_OPTIMIZE_FLAGS="-freorder-blocks -fno-reorder-functions -Os"
+    else
+        # From https://github.com/android-ndk/ndk/issues/133#issuecomment-308549264
+        # -Oz is smaller than -Os on clang.
+        MOZ_OPTIMIZE_FLAGS="-Oz"
     fi
     ;;