create 'org.lineageos.services'
this package just includes the required sources to make it build and boot.
org.lineageos.services is including 'services' statically.
That way, we only need to include org.lineageos.services as PRODUCT_SYSTEM_SERVER_JARS.
Change-Id: I05f2435b55a496112faf2ea8f85223b090c3ee96
diff --git a/Android.bp b/Android.bp
index 800b47e..b9b3e89 100644
--- a/Android.bp
+++ b/Android.bp
@@ -63,6 +63,7 @@
lineage_sdk_src = "sdk/src/java/lineageos"
lineage_sdk_internal_src = "sdk/src/java/org/lineageos/internal"
+lineage_sdk_minimal_internal_src = "sdk/src/java/org/lineageos/internal/minimal"
library_src = "lineage/lib/main/java"
lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES = [
@@ -73,6 +74,31 @@
"vendor.lineage.trust-V1.0-java",
]
+java_library {
+ name: "org.lineageos.services",
+ installable: true,
+ sdk_version: "core_platform",
+ static_libs: [
+ "services",
+ ] + lineage_sdk_LOCAL_STATIC_JAVA_LIBRARIES,
+
+ libs: [
+ "framework",
+ ],
+
+ srcs: [
+ library_src + "/**/*.java",
+ lineage_sdk_minimal_internal_src + "/**/*.java",
+ lineage_sdk_src + "/**/*.java",
+ lineage_sdk_src + "/app/I*.aidl",
+ lineage_sdk_src + "/**/I*.aidl",
+ ],
+ // Include aidl files from lineageos.app namespace as well as internal src aidl files
+ aidl: {
+ local_include_dirs: ["sdk/src/java"],
+ },
+}
+
// READ ME: ########################################################
//
// When updating this list of aidl files, consider if that aidl is
diff --git a/sdk/src/java/org/lineageos/internal/applications/LineageActivityManager.java b/sdk/src/java/org/lineageos/internal/minimal/applications/LineageActivityManager.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/applications/LineageActivityManager.java
rename to sdk/src/java/org/lineageos/internal/minimal/applications/LineageActivityManager.java
diff --git a/sdk/src/java/org/lineageos/internal/applications/LongScreen.java b/sdk/src/java/org/lineageos/internal/minimal/applications/LongScreen.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/applications/LongScreen.java
rename to sdk/src/java/org/lineageos/internal/minimal/applications/LongScreen.java
diff --git a/sdk/src/java/org/lineageos/internal/buttons/LineageButtons.java b/sdk/src/java/org/lineageos/internal/minimal/buttons/LineageButtons.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/buttons/LineageButtons.java
rename to sdk/src/java/org/lineageos/internal/minimal/buttons/LineageButtons.java
diff --git a/sdk/src/java/org/lineageos/internal/notification/LedValues.java b/sdk/src/java/org/lineageos/internal/minimal/notification/LedValues.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/notification/LedValues.java
rename to sdk/src/java/org/lineageos/internal/minimal/notification/LedValues.java
diff --git a/sdk/src/java/org/lineageos/internal/notification/LightsCapabilities.java b/sdk/src/java/org/lineageos/internal/minimal/notification/LightsCapabilities.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/notification/LightsCapabilities.java
rename to sdk/src/java/org/lineageos/internal/minimal/notification/LightsCapabilities.java
diff --git a/sdk/src/java/org/lineageos/internal/notification/LineageBatteryLights.java b/sdk/src/java/org/lineageos/internal/minimal/notification/LineageBatteryLights.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/notification/LineageBatteryLights.java
rename to sdk/src/java/org/lineageos/internal/minimal/notification/LineageBatteryLights.java
diff --git a/sdk/src/java/org/lineageos/internal/notification/LineageNotification.java b/sdk/src/java/org/lineageos/internal/minimal/notification/LineageNotification.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/notification/LineageNotification.java
rename to sdk/src/java/org/lineageos/internal/minimal/notification/LineageNotification.java
diff --git a/sdk/src/java/org/lineageos/internal/notification/LineageNotificationLights.java b/sdk/src/java/org/lineageos/internal/minimal/notification/LineageNotificationLights.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/notification/LineageNotificationLights.java
rename to sdk/src/java/org/lineageos/internal/minimal/notification/LineageNotificationLights.java
diff --git a/sdk/src/java/org/lineageos/internal/util/ActionUtils.java b/sdk/src/java/org/lineageos/internal/minimal/util/ActionUtils.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/ActionUtils.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/ActionUtils.java
diff --git a/sdk/src/java/org/lineageos/internal/util/DeviceKeysConstants.java b/sdk/src/java/org/lineageos/internal/minimal/util/DeviceKeysConstants.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/DeviceKeysConstants.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/DeviceKeysConstants.java
diff --git a/sdk/src/java/org/lineageos/internal/util/FileUtils.java b/sdk/src/java/org/lineageos/internal/minimal/util/FileUtils.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/FileUtils.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/FileUtils.java
diff --git a/sdk/src/java/org/lineageos/internal/util/ImageUtils.java b/sdk/src/java/org/lineageos/internal/minimal/util/ImageUtils.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/ImageUtils.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/ImageUtils.java
diff --git a/sdk/src/java/org/lineageos/internal/util/LineageLockPatternUtils.java b/sdk/src/java/org/lineageos/internal/minimal/util/LineageLockPatternUtils.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/LineageLockPatternUtils.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/LineageLockPatternUtils.java
diff --git a/sdk/src/java/org/lineageos/internal/util/MathUtils.java b/sdk/src/java/org/lineageos/internal/minimal/util/MathUtils.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/MathUtils.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/MathUtils.java
diff --git a/sdk/src/java/org/lineageos/internal/util/PackageManagerUtils.java b/sdk/src/java/org/lineageos/internal/minimal/util/PackageManagerUtils.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/PackageManagerUtils.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/PackageManagerUtils.java
diff --git a/sdk/src/java/org/lineageos/internal/util/PowerMenuConstants.java b/sdk/src/java/org/lineageos/internal/minimal/util/PowerMenuConstants.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/PowerMenuConstants.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/PowerMenuConstants.java
diff --git a/sdk/src/java/org/lineageos/internal/util/PowerMenuUtils.java b/sdk/src/java/org/lineageos/internal/minimal/util/PowerMenuUtils.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/PowerMenuUtils.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/PowerMenuUtils.java
diff --git a/sdk/src/java/org/lineageos/internal/util/ScreenType.java b/sdk/src/java/org/lineageos/internal/minimal/util/ScreenType.java
similarity index 100%
rename from sdk/src/java/org/lineageos/internal/util/ScreenType.java
rename to sdk/src/java/org/lineageos/internal/minimal/util/ScreenType.java