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

Commit dfedbb9e authored by John Grossman's avatar John Grossman Committed by Android (Google) Code Review
Browse files

Merge "De-AAH-ify the common time service." into ics-aah

parents 18cce49e 232f869c

cmds/servicemanager/service_manager.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ static struct { 
    { AID_RADIO, "isms" },

    { AID_RADIO, "isms" },

    { AID_RADIO, "iphonesubinfo" },

    { AID_RADIO, "iphonesubinfo" },

    { AID_RADIO, "simphonebook" },

    { AID_RADIO, "simphonebook" },

    { AID_MEDIA, "aah.common_clock" },

    { AID_MEDIA, "common_time.clock" },

};

};





void *svcmgr_handle;

void *svcmgr_handle;

libs/aah_timesrv/Android.mk→libs/common_time/Android.mk

+2 −2
Original line number Original line Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)

#

#

# libaah_timesrv_client

# libcommon_time_client

# (binder marshalers for ICommonClock as well as common clock and local clock

# (binder marshalers for ICommonClock as well as common clock and local clock

# helper code)

# helper code)

#

#





include $(CLEAR_VARS)

include $(CLEAR_VARS)





LOCAL_MODULE := libaah_timesrv_client

LOCAL_MODULE := libcommon_time_client

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_TAGS := optional

LOCAL_SRC_FILES := cc_helper.cpp \

LOCAL_SRC_FILES := cc_helper.cpp \

                   local_clock.cpp \

                   local_clock.cpp \