commit be332edb022cc32c7c34d22f2c8f96611401c529
author Colin Cross <ccross@android.com> Wed Sep 21 13:23:53 2016 -0700
committer Colin Cross <ccross@android.com> Wed Sep 21 13:23:55 2016 -0700
tree ec7dea592080ca08c694398e5e9b4fe7a74725e9
parent 32e2826a027b080ad85f3ca980d64d64b418e2fd

Reimplement ART_NDEBUG_OPT_FLAG

Use ART_NDEBUG_OPT_FLAG or ART_DEBUG_OPT_FLAG to override the default -O
compiler arguments.

Fixes: 31653144
Test: mmma -j art
Test: m -j dex2oat dex2oatd ART_NDEBUG_OPT_FLAG=-O1 ART_DEBUG_OPT_FLAG=-O0
Change-Id: I9d48d94f5e262148ddac5c70068144a645ac9566

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index 4be43ec..9156027 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -22,8 +22,6 @@
     name: "art_defaults",
     clang: true,
     cflags: [
-        "-O3",
-
         // Base set of cflags used by all things ART.
         "-fno-rtti",
         "-ggdb3",
@@ -149,10 +147,9 @@
     ],
 }
 
-cc_defaults {
+art_debug_defaults {
     name: "art_debug_defaults",
     cflags: [
-        "-O2",
         "-DDYNAMIC_ANNOTATIONS_ENABLED=1",
         "-DVIXL_DEBUG",
         "-UNDEBUG",