commit 440257ca4e71e717ed01bfa45412b5a244ca0bd4
author Yi Kong <yikong@google.com> Tue Feb 06 19:03:54 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 06 19:03:54 2018 +0000
tree b72716a0908ce6429a8e5b8c325f30a73bf03955
parent 8e3d2305230350d2cd3afa1dc3751ee19571e873
parent b0730c9755bcbb0998559e00663bcad5263cabdf

Ignore -Wpragma-pack warning am: 09d403257e
am: b0730c9755

Change-Id: I8a8e6c958e5cd125902e114eba74fb405766f1b8

Android.mk

diff --git a/Android.mk b/Android.mk
index 40219a2..1d862dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,7 @@
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
 LOCAL_SRC_FILES := $(sgdisk_src_files)
-LOCAL_CFLAGS += -Wno-unused-parameter -Werror
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-pragma-pack -Werror
 
 LOCAL_SHARED_LIBRARIES := libext2_uuid
 
@@ -42,7 +42,7 @@
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) external/e2fsprogs/lib
 LOCAL_SRC_FILES := $(sgdisk_src_files)
-LOCAL_CFLAGS += -Wno-unused-parameter -Werror
+LOCAL_CFLAGS += -Wno-unused-parameter -Wno-pragma-pack -Werror
 
 LOCAL_SHARED_LIBRARIES := libext2_uuid