am 4055b780: Merge "move native services under services/" into gingerbread

Merge commit '4055b780bb7e85abcf4754b84e50bf407c45bec8' into gingerbread-plus-aosp

* commit '4055b780bb7e85abcf4754b84e50bf407c45bec8':
  move native services under services/
This commit is contained in:
Mathias Agopian
2010-07-14 18:45:56 -07:00
committed by Android Git Automerger
73 changed files with 6 additions and 6 deletions

View File

@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \
libutils
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/../../libs/surfaceflinger
$(LOCAL_PATH)/../../services/surfaceflinger
LOCAL_MODULE:= surfaceflinger

View File

@ -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)

View File

@ -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