Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccd00916 authored by Tej Singh's avatar Tej Singh
Browse files

Move service-statsd.jar into statsd apex 

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.

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: I456a60d022d4286f47fe3dd5cd159de39897119e
parent c8bc76ef

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/CaptivePortalLogin) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/ext.jar)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/telephony/java/com/google/android/mms)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/*-service.jar)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/service-statsd.jar)

# ******************************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER

# ******************************************************************

apex/statsd/Android.bp

+1 −3
Original line number Diff line number Diff line
@@ -16,15 +16,13 @@ apex { 
    name: "com.android.os.statsd",

    defaults: ["com.android.os.statsd-defaults"],

    manifest: "apex_manifest.json",





}



apex_defaults {

    // libc.so and libcutils.so are included in the apex

    // native_shared_libs: ["libc", "libcutils"],

    // binaries: ["vold"],

    // java_libs: ["core-all"],

    java_libs: ["service-statsd"],

    // prebuilts: ["my_prebuilt"],

    name: "com.android.os.statsd-defaults",

    key: "com.android.os.statsd.key",

apex/statsd/service/Android.bp

+3 −3
Original line number Diff line number Diff line 
// Statsd Service jar, which will eventually be put in the statsd mainline apex.

// service-statsd needs to be added to PRODUCT_SYSTEM_SERVER_JARS.

// service-statsd needs to be added to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS.

// This jar will contain StatsCompanionService

java_library {

    name: "service-statsd",
@@ -8,9 +8,9 @@ java_library { 
    srcs: [

        "java/**/*.java",

    ],



    // TODO: link against the proper stubs (b/146084685).

    libs: [

        "framework",

        "framework-minus-apex",

        "services.core",

    ],

}