From e9403e4e794b908f93b91b58a4023679013d311b Mon Sep 17 00:00:00 2001 From: Tej Singh Date: Wed, 11 Dec 2019 16:02:37 -0800 Subject: [PATCH] Move service-statsd to updatable system server jar This moves StatsCompanionService into the statsd apex. service-statsd.jar is no longer installed to system/framework, and is instead installed to /apex/com.android.os.statsd/javalib/service-statsd.jar by moving it from PRODUCT_SYSTEM_SERVER_JARS to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS Bug: 145923413 Test: make clean; make; vendor/google/tools/flashall and manual inspection of jar locations Test: made trivial update to SCS and bumped the version of the apex. Then did: 1. make com.android.os.statsd 2. adb install com.android.os.statsd 3. adb reboot. Verified that the change was reflected via the apex update Change-Id: Ia261ea79b2a46a4cc709e1b7dd072de15e17571e --- target/product/base_system.mk | 2 +- target/product/media_system.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index 368b4e45b..91f62ee47 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -64,6 +64,7 @@ PRODUCT_PACKAGES += \ com.android.resolv \ com.android.neuralnetworks \ com.android.sdkext \ + com.android.os.statsd \ com.android.telephony \ com.android.tzdata \ com.android.wifi \ @@ -253,7 +254,6 @@ PRODUCT_PACKAGES += \ snapshotctl \ SoundPicker \ statsd \ - service-statsd \ storaged \ surfaceflinger \ svc \ diff --git a/target/product/media_system.mk b/target/product/media_system.mk index 6ace36163..fed42823c 100644 --- a/target/product/media_system.mk +++ b/target/product/media_system.mk @@ -55,14 +55,14 @@ PRODUCT_SYSTEM_SERVER_JARS := \ ethernet-service \ com.android.location.provider \ service-jobscheduler \ - service-statsd \ service-blobstore \ service-appsearch \ # system server jars which are updated via apex modules. # The values should be of the format : PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ - com.android.wifi:wifi-service + com.android.os.statsd:service-statsd \ + com.android.wifi:wifi-service \ PRODUCT_COPY_FILES += \ system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt