diff options
| author | Tej Singh <singhtejinder@google.com> | 2019-12-11 15:57:44 -0800 |
|---|---|---|
| committer | Tej Singh <singhtejinder@google.com> | 2019-12-12 15:14:42 -0800 |
| commit | ccd009164f8d4451844ce50e40da8be948ad725f (patch) | |
| tree | 14568bb097508a3e09534138339e5d56e922237a | |
| parent | c8bc76efff28708bceda138a1062efb63f1e93a3 (diff) | |
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
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | apex/statsd/Android.bp | 4 | ||||
| -rw-r--r-- | apex/statsd/service/Android.bp | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 8fac394a97fa..f94de29d41b1 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ****************************************************************** diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp index 8327f31e4645..5c46e1f22527 100644 --- a/apex/statsd/Android.bp +++ b/apex/statsd/Android.bp @@ -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", diff --git a/apex/statsd/service/Android.bp b/apex/statsd/service/Android.bp index f71d74fa03ff..f3a8989e633a 100644 --- a/apex/statsd/service/Android.bp +++ b/apex/statsd/service/Android.bp @@ -1,5 +1,5 @@ // 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", ], } |