commit 8d3288a4024004bb09b08485cee1ec36f1a52b28
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:47:05 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 15 21:47:05 2022 +0000
tree af0617635a45894ebe2e91ed29e892f6babc7048
parent ef5c095108585105b12307c9a37b7a4905b8e779
parent 225ec71c04c3d4d3c157a9da6e37a5f799b7c376

Snap for 8730993 from 225ec71c04c3d4d3c157a9da6e37a5f799b7c376 to mainline-tzdata3-release

Change-Id: I141a7d8a1887e084f54352bba9bf1ae8b9bbe57e

METADATA

diff --git a/METADATA b/METADATA
index 7893cf5..b6aba4e 100644
--- a/METADATA
+++ b/METADATA
@@ -1,4 +1,4 @@
 third_party {
-  license_note: "would be NOTICE save for scripts/image_signing/lib/shflags/shflags"
+  # 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 4fe990c..c2d5943 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>