Merge "vndk/window.h must be C compatible" into oc-dev (0e7305cb) · Commits · e / devices / smdk4412 / android_frameworks_native

libs/nativewindow/include/vndk/window.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,8 @@ enum ANativeWindowQuery {
		ANATIVEWINDOW_QUERY_YDPI = 0x10003,
		};

		typedef enum ANativeWindowQuery ANativeWindowQuery;

		/*
		* hook used to retrieve information about the native window.
		*

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,5 +17,7 @@
		cc_test {
		name: "AHardwareBufferTest",
		shared_libs: ["libnativewindow"],
		srcs: ["AHardwareBufferTest.cpp"],
		srcs: [
		"AHardwareBufferTest.cpp",
		"c_compatibility.c"],
		}

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 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.
		*/

		#include <android/hardware_buffer.h>
		#include <android/native_window.h>
		#include <vndk/window.h>

		// this checks that all these headers are C-compatible