diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-06-20 10:01:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-06-20 10:01:41 -0700 |
| commit | d393ed222601a8f284c8129bb375e18473089d73 (patch) | |
| tree | 15c9467b9a0272657ee4898f0e1070804fc0e335 | |
| parent | fa1935dfe7db9c80efbe61559a7d70084b16f0c3 (diff) | |
| parent | 0d977b69ffa9205758cdf6b9fcb580040d07dca5 (diff) | |
| download | uml-temp_p_merge.tar.gz | |
Stop overwriting surfaceflinger.rctemp_p_merge
am: 0d977b69ff
Change-Id: I9719e2929e5ec15d34f8dc8663375482a53999b5
| -rw-r--r-- | surfaceflinger.rc | 12 | ||||
| -rw-r--r-- | uml.mk | 2 |
2 files changed, 0 insertions, 14 deletions
diff --git a/surfaceflinger.rc b/surfaceflinger.rc deleted file mode 100644 index 0f2cb32..0000000 --- a/surfaceflinger.rc +++ /dev/null @@ -1,12 +0,0 @@ -# This custom surfaceflinger.rc simply has `disabled' appended to it. -# Since we are using UML without a screen, and embedded.mk is the -# smallest mk file but still contains surfaceflinger, including this -# custom surfaceflinger.rc will disable surfaceflinger from running. - -service surfaceflinger /system/bin/surfaceflinger - class core - user system - group graphics drmrpc readproc - onrestart restart zygote - writepid /dev/stune/foreground/tasks - disabled @@ -25,7 +25,6 @@ PRODUCT_CHARACTERISTICS := nosdcard PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.uml:root/fstab.uml PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.uml.rc:root/init.uml.rc -PRODUCT_COPY_FILES += $(LOCAL_PATH)/surfaceflinger.rc:system/etc/init/surfaceflinger.rc PRODUCT_COPY_FILES += $(LOCAL_PATH)/init.eth0.sh:system/bin/init.eth0.sh PRODUCT_PACKAGES += \ @@ -91,7 +90,6 @@ PRODUCT_PACKAGES += \ servicemanager \ shell_and_utilities \ storaged \ - surfaceflinger \ thermalserviced \ tombstoned \ tzdatacheck \ |