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

Commit 8e4244f3 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch 'v1-s-icon_redesign' into 'v1-s'

BlissLauncher3 related changes

See merge request !116
parents e921adb1 c5188812
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@
  <remove-project path="device/lineage/sepolicy" name="LineageOS/android_device_lineage_sepolicy" />
  <remove-project path="frameworks/base" name="LineageOS/android_frameworks_base" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="frameworks/libs/net" name="platform/frameworks/libs/net" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <remove-project path="frameworks/libs/systemui" name="platform/frameworks/libs/systemui" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
  <remove-project path="frameworks/opt/vcard" name="platform/frameworks/opt/vcard" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="lineage-sdk" name="LineageOS/android_lineage-sdk" />
  <remove-project path="packages/apps/Backgrounds" name="LineageOS/android_packages_apps_Backgrounds" />
@@ -25,6 +26,7 @@
  <remove-project path="packages/apps/Settings" name="LineageOS/android_packages_apps_Settings" groups="pdk-fs" />
  <remove-project path="packages/apps/SettingsIntelligence" name="LineageOS/android_packages_apps_SettingsIntelligence" groups="pdk-fs" />
  <remove-project path="packages/apps/SetupWizard" name="LineageOS/android_packages_apps_SetupWizard" />
  <remove-project path="packages/apps/ThemePicker" name="LineageOS/android_packages_apps_ThemePicker" groups="pdk-fs" />
  <remove-project path="packages/apps/Trebuchet" name="LineageOS/android_packages_apps_Trebuchet" />
  <remove-project path="packages/apps/Updater" name="LineageOS/android_packages_apps_Updater" />
  <remove-project path="packages/apps/WallpaperPicker2" name="LineageOS/android_packages_apps_WallpaperPicker2" groups="pdk-fs" />
@@ -34,9 +36,10 @@
  <remove-project path="packages/modules/Permission" name="LineageOS/android_packages_modules_Permission" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="packages/providers/MediaProvider" name="LineageOS/android_packages_providers_MediaProvider" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="packages/services/Telephony" name="LineageOS/android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" />
  <remove-project path="packages/overlays/Lineage" name="LineageOS/android_packages_overlays_Lineage" />
  <remove-project path="vendor/lineage" name="LineageOS/android_vendor_lineage" />

  <!-- /e/ OS additions -->

  <project path="android" name="e/os/android" remote="e" />
  <project path="build/make" name="e/os/android_build" groups="pdk" remote="e" >
    <copyfile src="core/root.mk" dest="Makefile" />
@@ -51,6 +54,7 @@
  <project path="device/lineage/sepolicy" name="e/os/android_device_lineage_sepolicy" remote="e" />
  <project path="frameworks/base" name="e/os/android_frameworks_base" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="frameworks/libs/net" name="e/os/android_frameworks_libs_net" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="frameworks/libs/systemui" name="e/os/android_frameworks_libs_systemui" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="frameworks/opt/vcard" name="e/os/android_frameworks_opt_vcard" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="lineage-sdk" name="e/os/android_lineage-sdk" remote="e" />
  <project path="packages/apps/Backgrounds" name="e/os/android_packages_apps_Backgrounds" remote="e" />
@@ -69,6 +73,7 @@
  <project path="packages/apps/Settings" name="e/os/android_packages_apps_Settings" groups="pdk-fs" remote="e" />
  <project path="packages/apps/SettingsIntelligence" name="e/os/android_packages_apps_SettingsIntelligence" groups="pdk-fs" remote="e" />
  <project path="packages/apps/SetupWizard" name="e/os/android_packages_apps_SetupWizard" remote="e"/>
  <project path="packages/apps/ThemePicker" name="e/os/android_packages_apps_ThemePicker" groups="pdk-fs" remote="e" />
  <project path="packages/apps/Trebuchet" name="e/os/android_packages_apps_Trebuchet" remote="e" />
  <project path="packages/apps/Updater" name="e/os/android_packages_apps_Updater" remote="e" />
  <project path="packages/apps/WallpaperPicker2" name="e/os/android_packages_apps_WallpaperPicker2" groups="pdk-fs" remote="e" />
@@ -78,6 +83,7 @@
  <project path="packages/modules/Permission" name="e/os/android_packages_modules_Permission" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/providers/MediaProvider" name="e/os/android_packages_providers_MediaProvider" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/services/Telephony" name="e/os/android_packages_services_Telephony" groups="pdk-cw-fs,pdk-fs" remote="e" />
  <project path="packages/overlays/Lineage" name="e/os/android_packages_overlays_Lineage" remote="e" />
  <project path="vendor/lineage" name="e/os/android_vendor_lineage" remote="e" />

  <!-- ih8sn -->
@@ -97,7 +103,4 @@

  <!-- vendor /e/os -->
  <project path="vendor/eos" name="e/os/android_vendor_eos" remote="e" />

  <!-- weather -->
  <project path="packages/providers/WeatherProvider" name="LineageOS/android_packages_providers_WeatherProvider" revision="lineage-16.0" />
</manifest>