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

Commit 1ab8e6b1 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch 'lineage-18.1' into v1-r

parents 2a758be3 2dedd9f6

README.mkdn

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ To get started with /e/ OS, you'll need to get familiar with [Source Control Too 


To initialize your local repository using the /e/ OS trees, use a command like this:

```

repo init -u https://gitlab.e.foundation/e/os/android.git -b v1-r

repo init -u https://gitlab.e.foundation/e/os/android.git -b v1-r --git-lfs

```

Then to sync up:

```

default.xml

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ 
  <project path="external/xz-embedded" name="platform/external/xz-embedded" groups="pdk" remote="aosp" />

  <project path="external/xz-java" name="platform/external/xz-java" groups="pdk" remote="aosp" />

  <project path="external/yapf" name="platform/external/yapf" groups="vts,projectarch,pdk" remote="aosp" />

  <project path="external/zlib" name="platform/external/zlib" groups="pdk" remote="aosp" />

  <project path="external/zlib" name="LineageOS/android_external_zlib" groups="pdk" />

  <project path="external/zopfli" name="platform/external/zopfli" groups="pdk" remote="aosp" />

  <project path="external/zxing" name="platform/external/zxing" groups="pdk" remote="aosp" />

  <project path="frameworks/av" name="LineageOS/android_frameworks_av" groups="pdk" />

snippets/lineage.xml

+4 −8
Original line number Diff line number Diff line
@@ -11,14 +11,10 @@ 
    <linkfile src="CleanSpec.mk" dest="external/chromium-webview/CleanSpec.mk" />

    <linkfile src="README" dest="external/chromium-webview/README" />

  </project>

  <project path="external/chromium-webview/prebuilt/arm" name="LineageOS/android_external_chromium-webview_prebuilt_arm" groups="pdk" clone-depth="1" revision="main" />

  <project path="external/chromium-webview/prebuilt/arm64" name="LineageOS/android_external_chromium-webview_prebuilt_arm64" groups="pdk" clone-depth="1" revision="main" />

  <project path="external/chromium-webview/prebuilt/x86" name="LineageOS/android_external_chromium-webview_prebuilt_x86" groups="pdk" clone-depth="1" revision="main" />

  <!-- The below will sync if you have a gitlab remote defined, but review/approval

       does not run through Gerrit. Additionally, those who sync referncing a

       mirror won't get that benefit from this remote/project. Place a line in

       a local manifest if you desire x86_64 Webview -->

  <!-- <project path="external/chromium-webview/prebuilt/x86_64" name="LineageOS/android/android_external_chromium-webview_prebuilt_x86_64" groups="pdk" clone-depth="1" revision="main" remote="gitlab" /> -->

  <project path="external/chromium-webview/prebuilt/arm" name="LineageOS/android_external_chromium-webview_prebuilt_arm" groups="pdk" revision="main" />

  <project path="external/chromium-webview/prebuilt/arm64" name="LineageOS/android_external_chromium-webview_prebuilt_arm64" groups="pdk" revision="main" />

  <project path="external/chromium-webview/prebuilt/x86" name="LineageOS/android_external_chromium-webview_prebuilt_x86" groups="pdk" revision="main" />

  <project path="external/chromium-webview/prebuilt/x86_64" name="LineageOS/android_external_chromium-webview_prebuilt_x86_64" groups="pdk" revision="main" />

  <project path="external/exfatprogs" name="LineageOS/android_external_exfatprogs" />

  <project path="external/htop" name="LineageOS/android_external_htop" />

  <project path="external/libncurses" name="LineageOS/android_external_libncurses" />