From 97369f8daf5856af43ee1c4568b4c3b5813a18ea Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 22 Nov 2019 11:40:08 +0000
Subject: [PATCH] Rename framework and service jars
Name them framework-* and service-* instead of *-(framework|service).
This matches the proposal in go/android-apex-for-framework.
Test: treehugger
Change-Id: I16754a5f08e002a8bc8862b11281f12cc6c8739f
---
CleanSpec.mk | 1 +
apex/appsearch/service/Android.bp | 2 +-
apex/blobstore/service/Android.bp | 4 ++--
apex/jobscheduler/README_js-mainline.md | 6 +++---
apex/jobscheduler/framework/Android.bp | 2 +-
apex/jobscheduler/service/Android.bp | 4 ++--
apex/statsd/service/Android.bp | 6 +++---
services/tests/mockingservicestests/Android.bp | 2 +-
services/tests/servicestests/Android.bp | 2 +-
tests/JobSchedulerPerfTests/Android.bp | 2 +-
10 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CleanSpec.mk b/CleanSpec.mk
index f7a2858351268..8fac394a97faf 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -255,6 +255,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/DefaultContainerSer
$(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)
# ******************************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER
# ******************************************************************
diff --git a/apex/appsearch/service/Android.bp b/apex/appsearch/service/Android.bp
index 2821fbef3e36c..2cd7aa009c46b 100644
--- a/apex/appsearch/service/Android.bp
+++ b/apex/appsearch/service/Android.bp
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
java_library {
- name: "appsearch-service",
+ name: "service-appsearch",
installable: true,
srcs: [
"java/**/*.java",
diff --git a/apex/blobstore/service/Android.bp b/apex/blobstore/service/Android.bp
index 019f98937df31..d8caa5aed788f 100644
--- a/apex/blobstore/service/Android.bp
+++ b/apex/blobstore/service/Android.bp
@@ -13,7 +13,7 @@
// limitations under the License.
java_library {
- name: "blobstore-service",
+ name: "service-blobstore",
installable: true,
srcs: [
@@ -24,4 +24,4 @@ java_library {
"framework",
"services.core",
],
-}
\ No newline at end of file
+}
diff --git a/apex/jobscheduler/README_js-mainline.md b/apex/jobscheduler/README_js-mainline.md
index ea20e3e29d996..134ff3da4507e 100644
--- a/apex/jobscheduler/README_js-mainline.md
+++ b/apex/jobscheduler/README_js-mainline.md
@@ -2,14 +2,14 @@
## Current structure
-- JS service side classes are put in `jobscheduler-service.jar`.
+- JS service side classes are put in `service-jobscheduler.jar`.
It's *not* included in services.jar, and instead it's put in the system server classpath,
which currently looks like the following:
-`SYSTEMSERVERCLASSPATH=/system/framework/services.jar:/system/framework/ethernet-service.jar:/system/framework/com.android.location.provider.jar:/system/framework/jobscheduler-service.jar`
+`SYSTEMSERVERCLASSPATH=/system/framework/services.jar:/system/framework/ethernet-service.jar:/system/framework/com.android.location.provider.jar:/system/framework/service-jobscheduler.jar`
`SYSTEMSERVERCLASSPATH` is generated from `PRODUCT_SYSTEM_SERVER_JARS`.
-- JS framework side classes are put in `jobscheduler-framework.jar`,
+- JS framework side classes are put in `framework-jobscheduler.jar`,
and the rest of the framework code is put in `framework-minus-apex.jar`,
as of http://ag/9145619.
diff --git a/apex/jobscheduler/framework/Android.bp b/apex/jobscheduler/framework/Android.bp
index 3902aa212e325..98bbe82431832 100644
--- a/apex/jobscheduler/framework/Android.bp
+++ b/apex/jobscheduler/framework/Android.bp
@@ -11,7 +11,7 @@ filegroup {
}
java_library {
- name: "jobscheduler-framework",
+ name: "framework-jobscheduler",
installable: false,
compile_dex: true,
sdk_version: "core_platform",
diff --git a/apex/jobscheduler/service/Android.bp b/apex/jobscheduler/service/Android.bp
index ca6dc45a356a9..c9d9d6c7d87ad 100644
--- a/apex/jobscheduler/service/Android.bp
+++ b/apex/jobscheduler/service/Android.bp
@@ -1,7 +1,7 @@
// Job Scheduler Service jar, which will eventually be put in the jobscheduler mainline apex.
-// jobscheduler-service needs to be added to PRODUCT_SYSTEM_SERVER_JARS.
+// service-jobscheduler needs to be added to PRODUCT_SYSTEM_SERVER_JARS.
java_library {
- name: "jobscheduler-service",
+ name: "service-jobscheduler",
installable: true,
srcs: [
diff --git a/apex/statsd/service/Android.bp b/apex/statsd/service/Android.bp
index 786e8b0260f8e..f71d74fa03ff8 100644
--- a/apex/statsd/service/Android.bp
+++ b/apex/statsd/service/Android.bp
@@ -1,8 +1,8 @@
// Statsd Service jar, which will eventually be put in the statsd mainline apex.
-// statsd-service needs to be added to PRODUCT_SYSTEM_SERVER_JARS.
+// service-statsd needs to be added to PRODUCT_SYSTEM_SERVER_JARS.
// This jar will contain StatsCompanionService
java_library {
- name: "statsd-service",
+ name: "service-statsd",
installable: true,
srcs: [
@@ -13,4 +13,4 @@ java_library {
"framework",
"services.core",
],
-}
\ No newline at end of file
+}
diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp
index 8699669bf4a5e..96fedf933a9cc 100644
--- a/services/tests/mockingservicestests/Android.bp
+++ b/services/tests/mockingservicestests/Android.bp
@@ -20,7 +20,7 @@ android_test {
static_libs: [
"services.core",
"services.net",
- "jobscheduler-service",
+ "service-jobscheduler",
"androidx.test.runner",
"mockito-target-extended-minus-junit4",
"platform-test-annotations",
diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp
index 52fb69eb99be4..0be5fe02f0fef 100644
--- a/services/tests/servicestests/Android.bp
+++ b/services/tests/servicestests/Android.bp
@@ -41,7 +41,7 @@ android_test {
"hamcrest-library",
"servicestests-utils",
"xml-writer-device-lib",
- "jobscheduler-service",
+ "service-jobscheduler",
],
aidl: {
diff --git a/tests/JobSchedulerPerfTests/Android.bp b/tests/JobSchedulerPerfTests/Android.bp
index c51b811f07352..2ae8c33b60a7c 100644
--- a/tests/JobSchedulerPerfTests/Android.bp
+++ b/tests/JobSchedulerPerfTests/Android.bp
@@ -19,7 +19,7 @@ android_test {
"androidx.test.rules",
"apct-perftests-utils",
"services",
- "jobscheduler-service",
+ "service-jobscheduler",
],
platform_apis: true,
certificate: "platform",
--
GitLab