commit 2b4c1a84f4367adc8240fc5ace5825811c731a09
author Bill Yi <byi@google.com> Wed Oct 24 14:47:13 2018 -0700
committer Bill Yi <byi@google.com> Wed Oct 24 14:47:13 2018 -0700
tree d04c3c76fec207eb95354f4ae863102e2b6fd1de
parent 64173cdb1d125e66880f3cbb8ce77a820bfca4e4
parent addeab5c023515a79a27cf707a193b9ae13f1afd

Merge pie-platform-release to aosp-master - DO NOT MERGE

Change-Id: I1a5ce7af1ee3d84f4315e05b58b9b4a861dec757

gpt-utils/Android.mk

diff --git a/gpt-utils/Android.mk b/gpt-utils/Android.mk
index aa6a0d0..8c83b84 100644
--- a/gpt-utils/Android.mk
+++ b/gpt-utils/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-gpt_utils_common_cflags := -Wall -Werror -Wno-unused-variable
+gpt_utils_common_cflags := -Wall -Werror
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := gpt-utils.cpp

gpt-utils/gpt-utils.cpp

diff --git a/gpt-utils/gpt-utils.cpp b/gpt-utils/gpt-utils.cpp
index e4651c4..7f04f42 100644
--- a/gpt-utils/gpt-utils.cpp
+++ b/gpt-utils/gpt-utils.cpp
@@ -51,7 +51,7 @@
 #include <vector>
 #include <string>
 #define LOG_TAG "gpt-utils"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include "gpt-utils.h"
 #include <endian.h>
@@ -747,7 +747,6 @@
     enum gpt_state gpt_prim, gpt_second;
     enum boot_update_stage internal_stage;
     struct stat xbl_partition_stat;
-    struct stat ufs_dir_stat;
 
     if (!dev_path) {
         fprintf(stderr, "%s: Invalid dev_path\n",
@@ -970,7 +969,6 @@
 
 int prepare_boot_update(enum boot_update_stage stage)
 {
-        int r, fd;
         int is_ufs = gpt_utils_is_ufs_device();
         struct stat ufs_dir_stat;
         struct update_data data;