Merge "Frameworks/base: Mask pdfium warning" into lmp-mr1-dev-plus-aosp

This commit is contained in:
Andreas Gampe
2014-11-14 00:09:00 +00:00
committed by Android (Google) Code Review

View File

@@ -16,11 +16,16 @@
#include "jni.h" #include "jni.h"
#include "JNIHelp.h" #include "JNIHelp.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
#include "fpdfview.h" #include "fpdfview.h"
#include "fpdfedit.h" #include "fpdfedit.h"
#include "fpdfsave.h" #include "fpdfsave.h"
#include "fsdk_rendercontext.h" #include "fsdk_rendercontext.h"
#include "fpdf_transformpage.h" #include "fpdf_transformpage.h"
#pragma GCC diagnostic pop
#include "SkMatrix.h" #include "SkMatrix.h"
#include <android_runtime/AndroidRuntime.h> #include <android_runtime/AndroidRuntime.h>