commit c564406ac428dc6de9998a48d97c445a03201338
author Colin Cross <ccross@android.com> Tue Aug 30 15:41:08 2016 -0700
committer Colin Cross <ccross@android.com> Tue Aug 30 15:43:41 2016 -0700
tree 80719542a56eb137a58be9eb50ceefb9d01f668a
parent d7eabc2cc1a88c1f7f927da61246ae65aab0626c

Fix debug flag ordering

art_debug_defaults needs to come first in the defaults list so that its
prepended flags come after the art_defaults flags.
-Wno-frame-larger-than= also needs to be inside a target block to match the
way the -Wframe-larger-than= flags are inserted by art.go so that they
come after.

Change-Id: I17c191ec9dcc393db1e0805cd058c768e4d09400

runtime/simulator/Android.bp

diff --git a/runtime/simulator/Android.bp b/runtime/simulator/Android.bp
index 05f44e3..2a49e7e 100644
--- a/runtime/simulator/Android.bp
+++ b/runtime/simulator/Android.bp
@@ -41,8 +41,8 @@
 cc_library_host_shared {
     name: "libart-simulatord",
     defaults: [
-        "libart_simulator_defaults",
         "art_debug_defaults",
+        "libart_simulator_defaults",
     ],
     shared_libs: [
         "libartd",