rr-q changes

README.md

@@ -1,6 +1,6 @@
-# LineageOS 17.1 for Sony Xperia devices lilac/xz1c, pioneer/xa2, xz2c, and perhaps more to come.
+# ResurrectionRemix Revived for Sony Xperia devices lilac/xz1c, pioneer/xa2, xz2c, and perhaps more to come.
 
-## How to build LineageOS
+## How to build ResurrectionRemix Revived
 
 ### Initial setup
 
@@ -11,21 +11,21 @@ https://wiki.lineageos.org/devices/pioneer/build/
 * Make a workspace:
 
     ```bash
-    mkdir -p ~/android/lineage
-    cd ~/android/lineage
+    mkdir -p ~/android/rr
+    cd ~/android/rr
     ```
 
 * Initialize the repo:
 
 
     ```bash
-    repo init -u https://github.com/LineageOS/android.git -b lineage-17.1 --git-lfs
+    repo init -u https://github.com/ResurrectionRemix-Revived/manifest.git -b Q --git-lfs
     ```
 
 * Create local manifests, e.g. by checking out a copy of this project and moving the files to the LineageOS folder:
 
     ```bash
-    git clone https://github.com/Eclipse-Community/build_lineage.git
+    git clone -b rr-q https://github.com/Eclipse-Community/build_lineage.git
     mv build_lineage/local_manifests/ .repo/
     ```
 
@@ -34,7 +34,7 @@ https://wiki.lineageos.org/devices/pioneer/build/
 * Sync the repo:
 
     ```bash
-    repo sync
+    repo sync --force-sync --no-clone-bundle
     ```
 
 * Tell git about Change-Id trailers
@@ -76,21 +76,19 @@ Copy [dumped firmware blobs](dump-stock.md) into place for the build
     $device is the device you want to build with. For now lilac, pioneer, and xz2c.
 
     ```bash
-    source build/envsetup.sh
-    lunch lineage_$device-userdebug
+    . build/envsetup.sh
+    lunch rr_$device-userdebug
     ```
 
-    You may also want to use 'lunch lineage_$device-user' instead if you use certain banking apps and such.
+    You may also want to use 'lunch rr_$device-user' instead if you use certain banking apps and such.
 
 * (Optional) Build with MicroG apps 
 
-    !!Requires all patches!! or the signature spoofing patch
-
     ```bash
-    export WITH_GMS=true
+    export GAPPS=false
     ```
 
-* Build LineageOS
+* Build ResurrectionRemix Revived
 
     ```bash
     m bacon

local_manifests/roomservice.xml

@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-    <!-- SONY -->
-    <project name="Eclipse-Community/android_kernel_sony_msm8998" path="kernel/sony/msm8998" remote="github" revision="lineage-17.1" />
-    <project name="Eclipse-Community/android_device_sony_yoshino-common" path="device/sony/yoshino-common" remote="github" revision="lineage-17.1" />
-    <project name="Eclipse-Community/android_device_sony_lilac" path="device/sony/lilac" remote="github" revision="lineage-17.1" />
-    <project name="Eclipse-Community/android_kernel_sony_sdm845-mod" path="kernel/sony/sdm845" remote="github" revision="lineage-17.1-kang" />
-    <project name="Eclipse-Community/android_device_sony_tama-common" path="device/sony/tama-common" remote="github" revision="lineage-17.1" />
-    <project name="Eclipse-Community/android_device_sony_xz2c" path="device/sony/xz2c" remote="github" revision="lineage-17.1" />
-    <project name="Eclipse-Community/android_kernel_sony_sdm660-mod" path="kernel/sony/sdm660" remote="github" revision="master" />
-    <project name="Eclipse-Community/android_device_sony_nile-common" path="device/sony/nile-common" remote="github" revision="lineage-17.1" />
-    <project name="Eclipse-Community/android_device_sony_pioneer" path="device/sony/pioneer" remote="github" revision="lineage-17.1" />
-
-    <!-- Pinned blobs for lilac -->
-    <project name="Flamefire/android_vendor_sony_lilac" path="vendor/sony/lilac" remote="github" revision="lineage-17.1" />
-</manifest>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest>
+    <!-- SONY -->
+    <project name="Eclipse-Community/android_kernel_sony_msm8998" path="kernel/sony/msm8998" remote="github" revision="lineage-17.1" />
+    <project name="Eclipse-Community/android_device_sony_yoshino-common" path="device/sony/yoshino-common" remote="github" revision="lineage-17.1" />
+    <project name="Eclipse-Community/android_device_sony_lilac" path="device/sony/lilac" remote="github" revision="rr-q" />
+    <project name="Eclipse-Community/android_kernel_sony_sdm845-mod" path="kernel/sony/sdm845" remote="github" revision="lineage-17.1-kang" />
+    <project name="Eclipse-Community/android_device_sony_tama-common" path="device/sony/tama-common" remote="github" revision="lineage-17.1" />
+    <project name="Eclipse-Community/android_device_sony_xz2c" path="device/sony/xz2c" remote="github" revision="rr-q" />
+    <project name="Eclipse-Community/android_kernel_sony_sdm660-mod" path="kernel/sony/sdm660" remote="github" revision="master" />
+    <project name="Eclipse-Community/android_device_sony_nile-common" path="device/sony/nile-common" remote="github" revision="lineage-17.1" />
+    <project name="Eclipse-Community/android_device_sony_pioneer" path="device/sony/pioneer" remote="github" revision="rr-q" />
+
+    <!-- Pinned blobs for lilac -->
+    <project name="Flamefire/android_vendor_sony_lilac" path="vendor/sony/lilac" remote="github" revision="lineage-17.1" />
+</manifest>

patches/allow-newer-kernel-clang.patch

@@ -1,4 +1,4 @@
-# PWD: vendor/lineage
+# PWD: vendor/rr
 
 From: LuK1337 <[email protected]>
 Date: Sun, 17 Oct 2021 15:21:24 +0200

patches/applyPatches.sh

@@ -18,8 +18,8 @@ function showError {
     echo -e "${RED}ERROR: $@${NC}" && false
 }
 
-repo_root=$(readlink -f "$PATCH_ROOT/../../../..")
-if [ ! -d "$repo_root/device/sony/lilac/patches" ]; then
+repo_root=$(readlink -f "$PATCH_ROOT/../..")
+if [ ! -d "$repo_root/build_lineage/patches" ]; then
   showError "Failed to find repository root at $repo_root"
 fi