diff options
| author | Mathias Agopian <mathias@google.com> | 2010-07-14 18:48:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-14 18:48:58 -0700 |
| commit | 0779682a490f12f102cd0cf1e768e3c68cfdc512 (patch) | |
| tree | f56869325b9a8ba8735ed6fd3155e648b114b0e3 /cmds | |
| parent | 607d117aa360f74bd1b83a849fbee87f9660ad93 (diff) | |
| parent | 78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f (diff) | |
| download | frameworks_base-0779682a490f12f102cd0cf1e768e3c68cfdc512.zip frameworks_base-0779682a490f12f102cd0cf1e768e3c68cfdc512.tar.gz frameworks_base-0779682a490f12f102cd0cf1e768e3c68cfdc512.tar.bz2 | |
am 78983a91: am 4055b780: Merge "move native services under services/" into gingerbread
Merge commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f'
* commit '78983a9133d3dd3f08b1ec462a7e2f9e7bfa9e2f':
move native services under services/
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/surfaceflinger/Android.mk | 2 | ||||
| -rw-r--r-- | cmds/system_server/library/Android.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmds/surfaceflinger/Android.mk b/cmds/surfaceflinger/Android.mk index bfa58a1..1df32bb 100644 --- a/cmds/surfaceflinger/Android.mk +++ b/cmds/surfaceflinger/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../libs/surfaceflinger + $(LOCAL_PATH)/../../services/surfaceflinger LOCAL_MODULE:= surfaceflinger diff --git a/cmds/system_server/library/Android.mk b/cmds/system_server/library/Android.mk index 1813d3e..a880a91 100644 --- a/cmds/system_server/library/Android.mk +++ b/cmds/system_server/library/Android.mk @@ -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) |