Commit 76c852d2 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'lineage-18.1' of gitlab.e.foundation:e/os/android into v1-r

 Conflicts:
	README.mkdn
	snippets/lineage.xml
parents 57a95c4f fd1dcf97
......@@ -228,7 +228,7 @@
<project path="external/kotlinx.coroutines" name="platform/external/kotlinx.coroutines" groups="pdk" remote="aosp" />
<project path="external/ksoap2" name="platform/external/ksoap2" groups="pdk" remote="aosp" />
<project path="external/libaom" name="platform/external/libaom" groups="pdk" remote="aosp" />
<project path="external/libavc" name="platform/external/libavc" groups="pdk" remote="aosp" />
<project path="external/libavc" name="LineageOS/android_external_libavc" groups="pdk" />
<project path="external/libbackup" name="platform/external/libbackup" groups="pdk" remote="aosp" />
<project path="external/libbrillo" name="platform/external/libbrillo" groups="pdk" remote="aosp" />
<project path="external/libcap" name="platform/external/libcap" groups="pdk" remote="aosp" />
......@@ -243,7 +243,7 @@
<project path="external/libepoxy" name="platform/external/libepoxy" groups="pdk" remote="aosp" />
<project path="external/libese" name="platform/external/libese" groups="pdk" remote="aosp" />
<project path="external/libevent" name="platform/external/libevent" groups="pdk" remote="aosp" />
<project path="external/libexif" name="platform/external/libexif" groups="pdk" remote="aosp" />
<project path="external/libexif" name="LineageOS/android_external_libexif" groups="pdk" />
<project path="external/libffi" name="platform/external/libffi" groups="pdk" remote="aosp" />
<project path="external/libfuse" name="platform/external/libfuse" groups="pdk" remote="aosp" />
<project path="external/libgav1" name="platform/external/libgav1" groups="pdk" remote="aosp" />
......@@ -693,7 +693,7 @@
<project path="system/connectivity/wificond" name="platform/system/connectivity/wificond" groups="pdk" remote="aosp" />
<project path="system/connectivity/wifilogd" name="platform/system/connectivity/wifilogd" groups="pdk" remote="aosp" />
<project path="system/core" name="LineageOS/android_system_core" groups="pdk" />
<project path="system/extras" name="platform/system/extras" groups="pdk" remote="aosp" />
<project path="system/extras" name="LineageOS/android_system_extras" groups="pdk" />
<project path="system/gatekeeper" name="platform/system/gatekeeper" groups="pdk" remote="aosp" />
<project path="system/gsid" name="platform/system/gsid" groups="pdk" remote="aosp" />
<project path="system/hardware/interfaces" name="platform/system/hardware/interfaces" groups="pdk" remote="aosp" />
......
......@@ -22,15 +22,12 @@
<project path="hardware/lineage/interfaces" name="LineageOS/android_hardware_lineage_interfaces" />
<project path="hardware/lineage/livedisplay" name="LineageOS/android_hardware_lineage_livedisplay" />
<project path="packages/apps/AudioFX" name="LineageOS/android_packages_apps_AudioFX" />
<!--<project path="packages/apps/Email" name="LineageOS/android_packages_apps_Email" />-->
<!--<project path="packages/apps/Exchange" name="LineageOS/android_packages_apps_Exchange" />-->
<project path="packages/apps/FMRadio" name="LineageOS/android_packages_apps_FMRadio" />
<project path="packages/apps/FlipFlap" name="LineageOS/android_packages_apps_FlipFlap" />
<project path="packages/apps/LineageCustomizer" name="LineageOS/android_packages_apps_LineageCustomizer" />
<project path="packages/apps/Profiles" name="LineageOS/android_packages_apps_Profiles" />
<project path="packages/apps/Seedvault" name="LineageOS/android_packages_apps_Seedvault" />
<project path="packages/apps/SimpleDeviceConfig" name="LineageOS/android_packages_apps_SimpleDeviceConfig" />
<!--<project path="packages/apps/UnifiedEmail" name="LineageOS/android_packages_apps_UnifiedEmail" />-->
<project path="packages/overlays/Lineage" name="LineageOS/android_packages_overlays_Lineage" />
<project path="packages/providers/WeatherProvider" name="LineageOS/android_packages_providers_WeatherProvider" revision="lineage-16.0" />
<project path="packages/resources/devicesettings" name="LineageOS/android_packages_resources_devicesettings" />
......@@ -57,9 +54,6 @@
<project path="hardware/qcom-caf/common" name="LineageOS/android_hardware_qcom-caf_common" groups="qcom,pdk-qcom" >
<!-- add guard for AOSP hardware/qcom dir -->
<linkfile src="os_pickup_aosp.mk" dest="hardware/qcom/Android.mk" />
<!-- for AOSP sdm845 and sm8150, we override os_pickup.mk -->
<!--<linkfile src="os_pickup.mk" dest="hardware/qcom/sdm845/Android.mk" />-->
<!--<linkfile src="os_pickup.mk" dest="hardware/qcom/sm8150/Android.mk" />-->
<!-- add guards for CAF repositories -->
<linkfile src="os_pickup.mk" dest="hardware/qcom-caf/apq8084/Android.mk" />
<linkfile src="os_pickup.mk" dest="hardware/qcom-caf/msm8916/Android.mk" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment