Skip to content

corkscrew: Fix build with gcc 4.8+ #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jrior001 wants to merge 3 commits into
base: jb-mr1
Choose a base branch
from
Open

corkscrew: Fix build with gcc 4.8+ #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39b3c45
fs_mgr: Drop the context mount option from non-selinux builds
rmcc Jul 21, 2013
47d6eba
Fix building without SELINUX
rmcc Jul 18, 2013
a2efd86
corkscrew: Fix build with gcc 4.8+
Dec 15, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions fs_mgr/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

ifeq ($(HAVE_SELINUX),true)
LOCAL_CFLAGS += -DHAVE_SELINUX
endif

LOCAL_SRC_FILES:= fs_mgr.c

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
Expand Down
9 changes: 9 additions & 0 deletions fs_mgr/fs_mgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,15 @@ int fs_mgr_mount_all(char *fstab_file)
}

for (i = 0; fstab[i].blk_dev; i++) {
#ifndef HAVE_SELINUX
char *contextpos = strstr(fstab[i].fs_options,",context=");

/* This makes it mandatory that context is the LAST mount option */
if (contextpos != NULL) {
*contextpos='\0';
}
#endif

if (fstab[i].fs_mgr_flags & MF_WAIT) {
wait_for_file(fstab[i].blk_dev, WAIT_TIMEOUT);
}
Expand Down
2 changes: 1 addition & 1 deletion init/init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ void service_start(struct service *svc, const char *dynamic_args)
pid_t pid;
int needs_console;
int n;
#ifdef HAVE_SELINUX
char *scon = NULL;
#ifdef HAVE_SELINUX
int rc;
#endif
/* starting a service removes it from the disabled or reset
Expand Down
2 changes: 1 addition & 1 deletion libcorkscrew/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ endif

LOCAL_SHARED_LIBRARIES += libdl libcutils libgccdemangle

LOCAL_CFLAGS += -std=gnu99 -Werror
LOCAL_CFLAGS += -std=gnu99 -Werror $(call cc-option,-Wno-error=unused-parameter)
LOCAL_MODULE := libcorkscrew
LOCAL_MODULE_TAGS := optional

Expand Down