commit 818cecb229904c310b1141c131966620d89ca599
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:06:58 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:06:58 2022 +0000
tree d03fa43f86449b1b8acc426fb8628b4618137d6e
parent 65fc6d02ce14984902ee3cbdcaad39c37c8e035d
parent 7f01d31c278f1f183b9287a5549959ada46041b6

Snap for 8564071 from 7f01d31c278f1f183b9287a5549959ada46041b6 to mainline-wifi-release

Change-Id: I48ef4cfe7954df494735ff4f871b4dffa5411881

METADATA

diff --git a/METADATA b/METADATA
index b6aba4e..7893cf5 100644
--- a/METADATA
+++ b/METADATA
@@ -1,4 +1,4 @@
 third_party {
-  # would be NOTICE save for scripts/image_signing/lib/shflags/shflags
+  license_note: "would be NOTICE save for scripts/image_signing/lib/shflags/shflags"
   license_type: RESTRICTED
 }

futility/dump_kernel_config_lib.c

diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
index c2d5943..4fe990c 100644
--- a/futility/dump_kernel_config_lib.c
+++ b/futility/dump_kernel_config_lib.c
@@ -5,10 +5,10 @@
  * Exports the kernel commandline from a given partition/image.
  */
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/mman.h>
-#include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>