commit 8a3760f8b2ce8ded477ba90dd8e1522b1df441b8
author benjaminwagner <benjaminwagner@google.com> Thu Oct 29 13:40:27 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Oct 29 13:40:28 2015 -0700
tree db8aab8dc1df19b14be784e45c8da7bdcad3d0c6
parent c75be34b4600d3acb5b076e6545efb05cce4abe6

For BUILD.public, let SkPreConfig.h set SK_RELEASE based on NDEBUG.

Use DumpStackTrace in SkASSERT in GOOGLE3.

There are extra assertions enabled in debug mode that cause RecordDraw_TextBounds to fail.

New include causes a naming conflict with global name "base".

Corresponding internal cl/106495354

No public API changes.

TBR=reed@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1423013004

BUILD.public

diff --git a/BUILD.public b/BUILD.public
index a2c3163..61fb53f 100644
--- a/BUILD.public
+++ b/BUILD.public
@@ -217,8 +217,8 @@
 DEPS_ANDROID = []
 
 DEPS = select({
-    CONDITION_ANDROID: DEPS_ANDROID + EXTERNAL_DEPS_ANDROID,
-    "//conditions:default": DEPS_UNIX + EXTERNAL_DEPS_UNIX,
+    CONDITION_ANDROID: DEPS_ANDROID + EXTERNAL_DEPS_ANDROID + EXTERNAL_DEPS_ALL,
+    "//conditions:default": DEPS_UNIX + EXTERNAL_DEPS_UNIX + EXTERNAL_DEPS_ALL,
 })
 
 # Platform-independent SRCS for DM.
@@ -322,8 +322,6 @@
 ]
 
 DEFINES_ALL = [
-    # It'd be nice for fastbuild, dbg -> SK_DEBUG, opt -> SK_RELEASE.
-    "SK_RELEASE",
     # Chrome DEFINES.
     "SK_USE_FLOATBITS",
     "SK_USE_FREETYPE_EMBOLDEN",
@@ -350,6 +348,7 @@
     copts = COPTS + ["-mssse3"],
     defines = DEFINES,
     includes = INCLUDES,
+    deps = EXTERNAL_DEPS_ALL,
 )
 
 cc_library(
@@ -358,6 +357,7 @@
     copts = COPTS + ["-msse4"],
     defines = DEFINES,
     includes = INCLUDES,
+    deps = EXTERNAL_DEPS_ALL,
 )
 
 cc_library(
@@ -380,7 +380,7 @@
         "--nogpu",
         "--verbose",
         # TODO(mtklein): maybe investigate why these fail?
-        "--match ~FontMgr ~Scalar ~Canvas ~Codec_stripes ~Codec_Dimensions ~Codec ~Stream ~skps ~Math",
+        "--match ~FontMgr ~Scalar ~Canvas ~Codec_stripes ~Codec_Dimensions ~Codec ~Stream ~skps ~Math ~RecordDraw_TextBounds",
         "--resourcePath %s/resources" % BASE_DIR,
         "--images %s/resources" % BASE_DIR,
     ],
@@ -390,5 +390,5 @@
     includes = DM_INCLUDES,
     deps = DM_EXTERNAL_DEPS + [
         ":skia",
-    ],
+    ] + EXTERNAL_DEPS_ALL,
 )