diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-07-15 13:22:04 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2013-07-15 15:08:39 -0700 |
| commit | ef691179799c11eceea0f118f79a32c47ca9ae96 (patch) | |
| tree | 7461b46fcfaa60c0511bcf1cab267a8e72043596 /services/jni/Android.mk | |
| parent | 6c1c0b6cbecf0cd0486a9a781da5e6f9bd2c0eaa (diff) | |
| download | frameworks_base-ef691179799c11eceea0f118f79a32c47ca9ae96.zip frameworks_base-ef691179799c11eceea0f118f79a32c47ca9ae96.tar.gz frameworks_base-ef691179799c11eceea0f118f79a32c47ca9ae96.tar.bz2 | |
Remove dead code in system server initialization.
System server always forks from Zygote so we no longer need
the system_server executable which was probably broken anyhow.
This makes the initialization sequence slightly more intelligible.
Likewise, we don't need the GrimReaper anymore because init
will automatically take care of restarting the system when the
service manager dies.
Change-Id: I02c88d9392f7c8133d9cde9d0d978da89ed80452
Diffstat (limited to 'services/jni/Android.mk')
| -rw-r--r-- | services/jni/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/jni/Android.mk b/services/jni/Android.mk index f332350..957c448 100644 --- a/services/jni/Android.mk +++ b/services/jni/Android.mk @@ -23,6 +23,7 @@ LOCAL_C_INCLUDES += \ $(JNI_H_INCLUDE) \ frameworks/base/services \ frameworks/base/core/jni \ + frameworks/native/services \ external/skia/include/core \ libcore/include \ libcore/include/libsuspend \ @@ -32,16 +33,17 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ libandroidfw \ + libbinder \ libcutils \ liblog \ libhardware \ libhardware_legacy \ libnativehelper \ - libsystem_server \ libutils \ libui \ libinput \ libinputservice \ + libsensorservice \ libskia \ libgui \ libusbhost \ |