From 83ccff716f160d3f9665732d50a7974f5f8e890a Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 24 Oct 2019 11:49:54 -0400 Subject: Move android.graphics JNI & APEX files into HWUI The graphics JNI code is now separate from libandroid_runtime and it along with HWUI headers are no longer visible to targets outside the boundary of what is to become the UI mainline module The exposed headers to targets outside the module are now restriced to C APIs contained in the apex header directory. Bug: 137655431 Test: CtsUiRenderingTestCases Change-Id: I30d34055b6870dc1039f190a88f4a747cee17300 --- libs/hwui/jni/CreateJavaOutputStreamAdaptor.h | 43 +++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 libs/hwui/jni/CreateJavaOutputStreamAdaptor.h (limited to 'libs/hwui/jni/CreateJavaOutputStreamAdaptor.h') diff --git a/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h new file mode 100644 index 000000000000..fccd4717c4b7 --- /dev/null +++ b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h @@ -0,0 +1,43 @@ +#ifndef _ANDROID_GRAPHICS_CREATE_JAVA_OUTPUT_STREAM_ADAPTOR_H_ +#define _ANDROID_GRAPHICS_CREATE_JAVA_OUTPUT_STREAM_ADAPTOR_H_ + +//#include +#include "jni.h" + +class SkMemoryStream; +class SkStream; +class SkStreamRewindable; +class SkWStream; + +/** + * Return an adaptor from a Java InputStream to an SkStream. + * Does not support rewind. + * @param env JNIEnv object. + * @param stream Pointer to Java InputStream. + * @param storage Java byte array for retrieving data from the + * Java InputStream. + * @param swallowExceptions Whether to call ExceptionClear() after + * an Exception is thrown. If false, it is up to the client to + * clear or propagate the exception. + * @return SkStream Simple subclass of SkStream which supports its + * basic methods like reading. Only valid until the calling + * function returns, since the Java InputStream is not managed + * by the SkStream. + */ +SkStream* CreateJavaInputStreamAdaptor(JNIEnv* env, jobject stream, jbyteArray storage, + bool swallowExceptions = true); + +/** + * Copy a Java InputStream. The result will be rewindable. + * @param env JNIEnv object. + * @param stream Pointer to Java InputStream. + * @param storage Java byte array for retrieving data from the + * Java InputStream. + * @return SkStreamRewindable The data in stream will be copied + * to a new SkStreamRewindable. + */ +SkStreamRewindable* CopyJavaInputStream(JNIEnv* env, jobject stream, jbyteArray storage); + +SkWStream* CreateJavaOutputStreamAdaptor(JNIEnv* env, jobject stream, jbyteArray storage); + +#endif // _ANDROID_GRAPHICS_CREATE_JAVA_OUTPUT_STREAM_ADAPTOR_H_ -- cgit v1.2.3 From c5882c4eb614179c8dad323cbbb115b62bb35f43 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Fri, 25 Oct 2019 11:11:32 -0400 Subject: Remove dependencies on headers outside UI module This includes AndroidRuntime and core_jni_helper.h Bug: 137655431 Test: CtsUiRenderingTestCases Change-Id: If3d26f41eaf4981505ee47634097f3645fd563fd --- libs/hwui/jni/CreateJavaOutputStreamAdaptor.h | 1 - 1 file changed, 1 deletion(-) (limited to 'libs/hwui/jni/CreateJavaOutputStreamAdaptor.h') diff --git a/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h index fccd4717c4b7..849418da01a1 100644 --- a/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h +++ b/libs/hwui/jni/CreateJavaOutputStreamAdaptor.h @@ -1,7 +1,6 @@ #ifndef _ANDROID_GRAPHICS_CREATE_JAVA_OUTPUT_STREAM_ADAPTOR_H_ #define _ANDROID_GRAPHICS_CREATE_JAVA_OUTPUT_STREAM_ADAPTOR_H_ -//#include #include "jni.h" class SkMemoryStream; -- cgit v1.2.3