p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tej Singh 2019-12-11 16:02:37 -08:00
parent e70ae57611
commit e9403e4e79
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/product/base_system.mk
View File

@ -64,6 +64,7 @@ PRODUCT_PACKAGES += \
com.android.resolv \ com.android.resolv \
com.android.neuralnetworks \ com.android.neuralnetworks \
com.android.sdkext \ com.android.sdkext \
com.android.os.statsd \
com.android.telephony \ com.android.telephony \
com.android.tzdata \ com.android.tzdata \
com.android.wifi \ com.android.wifi \
@ -253,7 +254,6 @@ PRODUCT_PACKAGES += \
snapshotctl \ snapshotctl \
SoundPicker \ SoundPicker \
statsd \ statsd \
service-statsd \
storaged \ storaged \
surfaceflinger \ surfaceflinger \
svc \ svc \

4
target/product/media_system.mk
View File

@ -55,14 +55,14 @@ PRODUCT_SYSTEM_SERVER_JARS := \
ethernet-service \ ethernet-service \
com.android.location.provider \ com.android.location.provider \
service-jobscheduler \ service-jobscheduler \
service-statsd \
service-blobstore \ service-blobstore \
service-appsearch \ service-appsearch \
# system server jars which are updated via apex modules. # system server jars which are updated via apex modules.
# The values should be of the format <apex name>:<jar name> # The values should be of the format <apex name>:<jar name>
PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \ PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS := \
com.android.wifi:wifi-service com.android.os.statsd:service-statsd \
com.android.wifi:wifi-service \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt system/core/rootdir/etc/public.libraries.android.txt:system/etc/public.libraries.txt