commit ef0c455c3dc44e9919e20062792584cbf01d6255
author Verena Beckham <verena@codeplay.com> Fri Feb 19 18:54:43 2016 +0000
committer Stephen Hines <srhines@google.com> Mon Mar 28 17:03:03 2016 -0700
tree d6998c7c95a0d579e63da02661ce23363d6b38a8
parent dd640a440f852201a911732768362cc89425602c

Make RenderScript constants variables instead of macros.

Implement the RenderScript constants as extern const variables
instead of macros. This allows lldb to inspect the RenderScript
constants, because their symbols will appear in the final shared
object. Old behaviour is retained for RS_VERSION < UNRELEASED.

Change-Id: I05d59a8560f264e82fdf84a92eeeec1d7db5a7a4

Signed-off-by: Verena Beckham <verena@codeplay.com>

api/GenerateHeaderFiles.cpp

diff --git a/api/GenerateHeaderFiles.cpp b/api/GenerateHeaderFiles.cpp
index ce778b3..9f40d3d 100644
--- a/api/GenerateHeaderFiles.cpp
+++ b/api/GenerateHeaderFiles.cpp
@@ -120,7 +120,13 @@
     const Constant* constant = spec.getConstant();
     VersionInfo info = spec.getVersionInfo();
     writeVersionGuardStart(file, info, constant->getFinalVersion());
-    *file << "#define " << constant->getName() << " " << spec.getValue() << "\n\n";
+
+    *file << "#if (defined(RS_VERSION) && (RS_VERSION >= UNRELEASED))\n";
+    *file << "extern const " << spec.getType() << " " << constant->getName() << ";\n";
+    *file << "#else\n";
+    *file << "#define " << constant->getName() << " " << spec.getValue() << "\n";
+    *file << "#endif\n\n";
+
     writeVersionGuardEnd(file, info);
 }