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

Commit 4055b780 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "move native services under services/" into gingerbread

parents ed86eaa7 08e83bb3

cmds/surfaceflinger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ 
	libutils



LOCAL_C_INCLUDES := \

	$(LOCAL_PATH)/../../libs/surfaceflinger

	$(LOCAL_PATH)/../../services/surfaceflinger



LOCAL_MODULE:= surfaceflinger

cmds/system_server/library/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ LOCAL_SRC_FILES:= \ 
base = $(LOCAL_PATH)/../../..



LOCAL_C_INCLUDES := \

	$(base)/camera/libcameraservice \

	$(base)/libs/audioflinger \

	$(base)/libs/surfaceflinger \

	$(base)/services/camera/libcameraservice \

	$(base)/services/audioflinger \

	$(base)/services/surfaceflinger \

	$(base)/media/libmediaplayerservice \

	$(JNI_H_INCLUDE)

media/mediaserver/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ LOCAL_SHARED_LIBRARIES := \ 
base := $(LOCAL_PATH)/../..



LOCAL_C_INCLUDES := \

    $(base)/libs/audioflinger \

    $(base)/camera/libcameraservice \

    $(base)/services/audioflinger \

    $(base)/services/camera/libcameraservice \

    $(base)/media/libmediaplayerservice



LOCAL_MODULE:= mediaserver