commit ad87810a307727cd0b223d176084412e548faef7
author Mathias Agopian <mathias@google.com> Fri Feb 24 23:25:50 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 24 23:25:50 2017 +0000
tree 0b5b97a617c893f3d1fdf0c09bccf3e693e670be
parent 00a1513cea6f218988464e75a4148bc218148339
parent e9acc296d55d47ba9ab714f5afff284b8c9b2f5b

Merge changes Ie7574cfe,Icc302d2b

* changes:
  remove unneeded forward declaration
  fix typo (minor)

libs/nativewindow/Android.bp

diff --git a/libs/nativewindow/Android.bp b/libs/nativewindow/Android.bp
index 4d1d8ac..46e5d50 100644
--- a/libs/nativewindow/Android.bp
+++ b/libs/nativewindow/Android.bp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 ndk_headers {
-    name: "libnativewdinwow_headers",
+    name: "libnativewindwow_headers",
     from: "include/android",
     to: "android",
     srcs: ["include/android/*.h"],

vulkan/include/vulkan/vulkan.h

diff --git a/vulkan/include/vulkan/vulkan.h b/vulkan/include/vulkan/vulkan.h
index 0980f24..33ed5be 100644
--- a/vulkan/include/vulkan/vulkan.h
+++ b/vulkan/include/vulkan/vulkan.h
@@ -3702,7 +3702,6 @@
 
 #ifdef VK_USE_PLATFORM_ANDROID_KHR
 #define VK_KHR_android_surface 1
-struct ANativeWindow;
 
 #define VK_KHR_ANDROID_SURFACE_SPEC_VERSION 6
 #define VK_KHR_ANDROID_SURFACE_EXTENSION_NAME "VK_KHR_android_surface"