Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9c37922 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 1d421490: Merge "Include to define uid_t." into jb-mr1-dev 

* commit '1d421490':
  Include to define uid_t.
parents 2f096c3a 1d421490

include/cutils/multiuser.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef __CUTILS_MULTIUSER_H

#define __CUTILS_MULTIUSER_H



#include <sys/types.h>



#ifdef __cplusplus

extern "C" {

#endif

libcutils/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ commonSources := \ 
	threads.c \

	sched_policy.c \

	iosched_policy.c \

	str_parms.c \

	multiuser.c

	str_parms.c



commonHostSources := \

        ashmem-host.c
@@ -125,7 +124,8 @@ LOCAL_SRC_FILES := $(commonSources) \ 
        mq.c \

        partition_utils.c \

        qtaguid.c \

        uevent.c

        uevent.c \

        multiuser.c



ifeq ($(TARGET_ARCH),arm)

LOCAL_SRC_FILES += arch-arm/memset32.S