rename org.lineageos.services to services
services also is going to be renamed to original.services.
This way we can pass 'CtsClasspathsTestCases - com.android.os.classpath.ClasspathsTest#testSystemServerClasspath',
which is expecting to find 'services.jar' in the SystemServerClasspath.
We had removed services from the SystemServerClasspath in previous commit(s) to fix another cts issue:
https://review.shift-gmbh.com/c/SHIFTPHONES/android_build/+/19748
Test: atest CtsClasspathsTestCases
Change-Id: I563defe193af6f0ba4115fbef3fee3b4fca62d21
diff --git a/Android.bp b/Android.bp
index b9b3e89..0abaffb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,11 +75,11 @@
]
java_library {
- name: "org.lineageos.services",
+ name: "services",
installable: true,
sdk_version: "core_platform",
static_libs: [
- "services",
+ "original.services",
] + lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES,
libs: [
@@ -118,7 +118,7 @@
libs: [
"framework",
- "services",
+ "original.services",
],
srcs: [
@@ -140,7 +140,7 @@
java_library {
name: "org.lineageos.platform.internal",
- required: ["services"],
+ required: ["original.services"],
static_libs: lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES,
srcs: [
@@ -176,7 +176,7 @@
java_library {
name: "org.lineageos.platform.sdk",
- required: ["services"],
+ required: ["original.services"],
static_libs: lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES,
srcs: [