diff options
| author | Mathias Agopian <mathias@google.com> | 2012-03-23 16:46:19 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-23 16:46:19 -0700 |
| commit | 2cd24ecf61e374d8b9feafec78ccefb5d3ae647e (patch) | |
| tree | 9f15e8f76ecde7121d4b1281bc29dc9da21dddf2 /native/include/android/native_window_jni.h | |
| parent | fbd0509f4746ae1ebca4ab91fc55ebd234ba9d3d (diff) | |
| parent | 60b82263a11e655408bbae1470728d58e1631b21 (diff) | |
| download | frameworks_base-2cd24ecf61e374d8b9feafec78ccefb5d3ae647e.zip frameworks_base-2cd24ecf61e374d8b9feafec78ccefb5d3ae647e.tar.gz frameworks_base-2cd24ecf61e374d8b9feafec78ccefb5d3ae647e.tar.bz2 | |
Merge "move ndk headers to frameworks/native"
Diffstat (limited to 'native/include/android/native_window_jni.h')
| -rw-r--r-- | native/include/android/native_window_jni.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/native/include/android/native_window_jni.h b/native/include/android/native_window_jni.h deleted file mode 100644 index b9e72ef..0000000 --- a/native/include/android/native_window_jni.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef ANDROID_NATIVE_WINDOW_JNI_H -#define ANDROID_NATIVE_WINDOW_JNI_H - -#include <android/native_window.h> - -#include <jni.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * Return the ANativeWindow associated with a Java Surface object, - * for interacting with it through native code. This acquires a reference - * on the ANativeWindow that is returned; be sure to use ANativeWindow_release() - * when done with it so that it doesn't leak. - */ -ANativeWindow* ANativeWindow_fromSurface(JNIEnv* env, jobject surface); - -#ifdef __cplusplus -}; -#endif - -#endif // ANDROID_NATIVE_WINDOW_H |
