aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-10 07:11:50 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-05-10 07:11:50 +0000
commit99cc0a11bbdef977c1174e1173df5e4c09b59952 (patch)
treed03fa43f86449b1b8acc426fb8628b4618137d6e
parent87286aa4af034b6d4f0638e8385b9d4b9da11aaf (diff)
parent7f01d31c278f1f183b9287a5549959ada46041b6 (diff)
downloadvboot_reference-android13-mainline-conscrypt-release.tar.gz
Snap for 8564071 from 7f01d31c278f1f183b9287a5549959ada46041b6 to mainline-conscrypt-releaseaml_con_331413000aml_con_331411000aml_con_331312000aml_con_331115000aml_con_331011010android13-mainline-conscrypt-release
Change-Id: Ie5e3d50471f182258219a95b52018c79eab72b16
-rw-r--r--METADATA2
-rw-r--r--futility/dump_kernel_config_lib.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/METADATA b/METADATA
index b6aba4e1..7893cf55 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
}
diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
index c2d59433..4fe990c3 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>