diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2014-12-09 12:39:06 -0800 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2014-12-09 12:39:06 -0800 |
| commit | 691cc2f2a5d98a638082a264cb9ce9829591db16 (patch) | |
| tree | e4d449e98eb1cf802a325afb5c592da0fb22d586 /src | |
| parent | 66e89d84384007c6c853e813927a0478d80813bf (diff) | |
| parent | cc408c440d94af1f1fa54f510b2a1725017e652c (diff) | |
Merge branch 'liuyq/fix-android-5.0-build'
* cooking/liuyq/fix-android-5.0-build:
Android.mk: fix problem when compile with 64bit version
droid_surfaceflingerlink.cpp: fix compiling error for android5.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/waffle/android/droid_surfaceflingerlink.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/waffle/android/droid_surfaceflingerlink.cpp b/src/waffle/android/droid_surfaceflingerlink.cpp index 765f70f..397c86c 100644 --- a/src/waffle/android/droid_surfaceflingerlink.cpp +++ b/src/waffle/android/droid_surfaceflingerlink.cpp @@ -23,8 +23,9 @@ // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#if WAFFLE_ANDROID_MAJOR_VERSION >= 4 && \ - WAFFLE_ANDROID_MINOR_VERSION >= 1 +#if WAFFLE_ANDROID_MAJOR_VERSION == 4 && \ + WAFFLE_ANDROID_MINOR_VERSION >= 1 || \ + WAFFLE_ANDROID_MAJOR_VERSION >= 5 # include <gui/Surface.h> # include <gui/SurfaceComposerClient.h> #elif WAFFLE_ANROID_MAJOR_VERSION >= 4 && \ @@ -107,8 +108,9 @@ droid_setup_surface( // The signature of SurfaceComposerClient::createSurface() differs across // Android versions. -#if WAFFLE_ANDROID_MAJOR_VERSION >= 4 && \ - WAFFLE_ANDROID_MINOR_VERSION >= 2 +#if WAFFLE_ANDROID_MAJOR_VERSION == 4 && \ + WAFFLE_ANDROID_MINOR_VERSION >= 2 || \ + WAFFLE_ANDROID_MAJOR_VERSION >= 5 pANWContainer->surface_control = pSFContainer->composer_client->createSurface( String8("Waffle Surface"), |