commit 9393a945d17f0a82bce07c7b6290666c5b3535e6
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 24 23:30:16 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 24 23:30:17 2017 +0000
tree ccde366b3572139327506fa645c9cf774a777e94
parent ad87810a307727cd0b223d176084412e548faef7
parent 4b97f0fd6ca0f8e5ca509f1891eb84e20027b8c6

Merge "docs: Fix links in native multinetwork API documentation. Test: Verified by manual build."

cmds/dumpstate/dumpstate.cpp

diff --git a/cmds/dumpstate/dumpstate.cpp b/cmds/dumpstate/dumpstate.cpp
index 349bbed..0ac6353 100644
--- a/cmds/dumpstate/dumpstate.cpp
+++ b/cmds/dumpstate/dumpstate.cpp
@@ -1161,7 +1161,7 @@
     printf("== Board\n");
     printf("========================================================\n");
 
-    ::android::sp<IDumpstateDevice> dumpstate_device(IDumpstateDevice::getService("dumpstate"));
+    ::android::sp<IDumpstateDevice> dumpstate_device(IDumpstateDevice::getService());
     if (dumpstate_device == nullptr) {
         MYLOGE("No IDumpstateDevice implementation\n");
         return;

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"