diff options
| author | Tim Murray <timmurray@google.com> | 2013-09-09 15:03:50 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2013-09-09 15:03:50 -0700 |
| commit | eeaf7142d7e06efb3e0ddc7ef542884ab1d527dc (patch) | |
| tree | 079a0330ccaf2bcba1c9e40f97850a716afd6902 /cpp | |
| parent | e918375be0045b082128d7f958ce685062aaefb2 (diff) | |
| download | rs-eeaf7142d7e06efb3e0ddc7ef542884ab1d527dc.tar.gz | |
Fix build/dependency issue.
bug 10427951
Change-Id: I798a0014f299b22c26bea3205823fcbb64f7ec70
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/BaseObj.cpp | 1 | ||||
| -rw-r--r-- | cpp/Element.cpp | 1 | ||||
| -rw-r--r-- | cpp/RenderScript.cpp | 4 | ||||
| -rw-r--r-- | cpp/Type.cpp | 1 | ||||
| -rw-r--r-- | cpp/rsCppInternal.h | 7 | ||||
| -rw-r--r-- | cpp/rsCppStructs.h | 1 |
6 files changed, 11 insertions, 4 deletions
diff --git a/cpp/BaseObj.cpp b/cpp/BaseObj.cpp index efcb83a2..80d94145 100644 --- a/cpp/BaseObj.cpp +++ b/cpp/BaseObj.cpp @@ -15,6 +15,7 @@ */ #include "RenderScript.h" +#include "rsCppInternal.h" using namespace android; using namespace RSC; diff --git a/cpp/Element.cpp b/cpp/Element.cpp index 8223f99d..db7df64a 100644 --- a/cpp/Element.cpp +++ b/cpp/Element.cpp @@ -18,6 +18,7 @@ #include <string.h> #include "RenderScript.h" +#include "rsCppInternal.h" using namespace android; using namespace RSC; diff --git a/cpp/RenderScript.cpp b/cpp/RenderScript.cpp index 6ab22404..fb72738f 100644 --- a/cpp/RenderScript.cpp +++ b/cpp/RenderScript.cpp @@ -20,6 +20,7 @@ #include "RenderScript.h" #include "rsCppStructs.h" +#include "rsCppInternal.h" #include <dlfcn.h> @@ -27,9 +28,6 @@ #include <cutils/properties.h> #endif -#define LOG_NDEBUG 0 -#define LOG_TAG "rsC++" - using namespace android; using namespace RSC; diff --git a/cpp/Type.cpp b/cpp/Type.cpp index bc86a94b..07da0c5d 100644 --- a/cpp/Type.cpp +++ b/cpp/Type.cpp @@ -18,6 +18,7 @@ #include <string.h> #include "RenderScript.h" +#include "rsCppInternal.h" // from system/graphics.h enum { diff --git a/cpp/rsCppInternal.h b/cpp/rsCppInternal.h index 3f1e1306..904c5abf 100644 --- a/cpp/rsCppInternal.h +++ b/cpp/rsCppInternal.h @@ -17,6 +17,8 @@ #ifndef ANDROID_RS_CPP_INTERNAL_H #define ANDROID_RS_CPP_INTERNAL_H +#include "rsCppUtils.h" + #define tryDispatch(rs, dispatch) \ if (rs->getError() == RS_SUCCESS) { \ dispatch; \ @@ -25,4 +27,9 @@ #define createDispatch(rs, dispatch) \ rs->getError() == RS_SUCCESS ? dispatch : NULL +#undef LOG_TAG +#undef LOG_NDEBUG +#define LOG_NDEBUG 0 +#define LOG_TAG "rsC++" + #endif diff --git a/cpp/rsCppStructs.h b/cpp/rsCppStructs.h index 1a04a5c3..9ec80767 100644 --- a/cpp/rsCppStructs.h +++ b/cpp/rsCppStructs.h @@ -18,7 +18,6 @@ #define ANDROID_RSCPPSTRUCTS_H #include "rsDefines.h" -#include "rsCppUtils.h" #include "util/RefBase.h" #include "rsDispatch.h" |