From 12914fac70deb2a22d8bb86e092a002a993ab3b3 Mon Sep 17 00:00:00 2001
From: Dan Pasanen <dan.pasanen@gmail.com>
Date: Sat, 17 Mar 2018 05:54:56 -0500
Subject: [PATCH] update-binary: Add support for system-as-root devices for the
 zip

* We'll first check the currently loaded slot. We can
  assume the user just flashed a rom and that the target
  slot for this rom is the other slot, so mount that
  system image. TODO: autodetect this somehow

* Mount this system partition at /system_root (rw) and then
  mount the /system/system folder at /system. We do it
  this way for a couple reasons. Because it makes the
  script easier to work with and because we're using
  toybox from the system partition for operations, which
  is expecting /system/bin/linker64 to exist.

Change-Id: Ia6f96f0864d725b0123665bbbce0e31523bb834f
---
 build/meta/com/google/android/update-binary | 58 +++++++++++++--------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary
index 0fc5a88..8e2ce68 100644
--- a/build/meta/com/google/android/update-binary
+++ b/build/meta/com/google/android/update-binary
@@ -29,38 +29,50 @@ ui_print "**********************"
 ui_print "MindTheGapps installer"
 ui_print "**********************"
 
-ABDEVICE=`getprop ro.build.system_root_image`
+SYSTEMASROOT=`getprop ro.build.system_root_image`
 
 ui_print "Mounting system partition"
 
-if [ "$ABDEVICE" == "true" ]; then
-  SYSTEM="/system/system"
-  # TODO: Actually handle A/B ota devices
-  ui_print "A/B OTA device detected! This is unsupported. Aborting"
-  exit 1
-else
-  SYSTEM="/system"
-  if mount $SYSTEM; then
-    ui_print "$SYSTEM mounted"
+if [ "$SYSTEMASROOT" == "true" ]; then
+  CURRENTSLOT=`getprop ro.boot.slot_suffix`
+  if [ ! -z "$CURRENTSLOT" ]; then
+    if [ "$CURRENTSLOT" == "_a" ]; then
+      TARGETSYSTEM=/dev/block/bootdevice/by-name/system_b
+    else
+      TARGETSYSTEM=/dev/block/bootdevice/by-name/system_a
+    fi
   else
-    ui_print "Could not mount $SYSTEM! Aborting"
-  exit 1
+    TARGETSYSTEM=/dev/block/bootdevice/by-name/system
+  fi
+  mkdir -p /system_root
+  if mount -o rw $TARGETSYSTEM /system_root && mount /system_root/system /system; then
+    ui_print "/system mounted"
+  else
+    ui_print "Could not mount /system! Aborting"
+    exit 1
+  fi
+else
+  if mount /system; then
+    ui_print "/system mounted"
+  else
+    ui_print "Could not mount /system! Aborting"
+    exit 1
   fi
 fi
 
-if [ -f $SYSTEM/bin/toybox ]; then
-  UTILS=$SYSTEM/bin/toybox
-  LD_PATH=$SYSTEM/lib
+if [ -f /system/bin/toybox ]; then
+  UTILS=/system/bin/toybox
+  LD_PATH=/system/lib
 else
-  ui_print "Could not find $SYSTEM/bin/toybox! Aborting"
+  ui_print "Could not find /system/bin/toybox! Aborting"
   exit 1
 fi
 
 DIRS="addon.d app priv-app framework etc lib"
 
-if [ -d $SYSTEM/lib64 ]; then
+if [ -d /system/lib64 ]; then
   DIRS="$DIRS lib64"
-  LD_PATH=$SYSTEM/lib64
+  LD_PATH=/system/lib64
 fi
 
 LOWMEM=1572864
@@ -103,14 +115,18 @@ for dirs in $DIRS; do
   done
 done
 ui_print "Copying files"
-exec_util "cp --preserve=a -r ./* $SYSTEM/"
-exec_util "rm -rf $SYSTEM/priv-app/Provision/"
+exec_util "cp --preserve=a -r ./* /system/"
+exec_util "rm -rf /system/priv-app/Provision/"
 ui_print "Cleaning up files"
 cd ../
 exec_util "rm -rf system/"
 
 ui_print "Unmounting system partition"
-umount $SYSTEM
+if umount /system; then
+  if [ "$SYSTEMASROOT" == "true" ]; then
+    umount /system_root
+  fi
+fi
 
 ui_print "Done!"
 exit 0