gello-build: update for m58cm-14.1

Change-Id: I96f6a360652012b823d2a093c92a626aadd817c7
Signed-off-by: Joey Rizzoli <joey@lineageos.org>

3 files changed, 26 insertions, 42 deletions

diff --git a/README.md b/README.md
index e628f45..37b3965 100644
--- a/README.md
+++ b/README.md
@@ -11,26 +11,26 @@ Features
 - *--clean* = Make a clean build
 - *--depot* = Install Depot Tool
 - *--fast* = Skip sync and runhooks, useful for testing changes
-- *--local* = Pick local gello from packages/apps/Gello (for testing purpose)
 - *--no-sync* = Skip sync
 
 How to build
 ----------
-If you're going to build from CyanogenMod build environment you will be able to choose between Sourcebuilt or Prebuilt. By default CyanogenMod uses Prebuilt to save you time, data and disk space.
+If you're going to build from LineageOS build environment you will be able to choose between Sourcebuilt or Prebuilt. By default LineageOS uses Prebuilt to save you time, data and disk space.
 If you don't want to use/trust prebuilt apk (that comes from CyanogenMod Maven) for some reason, you're free to build it yourself on your own machine. To build from source you just need to run the following commands:
 
     export WITH_GELLO_SOURCE=true
     mka Gello
-To be able to build Gello you'll need to set up your machine, see [Setup](https://github.com/CyanogenMod/android_external_gello_build#setup).
+To be able to build Gello you'll need to set up your machine, see [Setup](https://github.com/LineageOS/android_external_gello_build#setup).
 
 Testing
 ----------
-If you're working on the Gello shell (packages/apps/Gello), and you've sucessfully compiled at least once,
-you may want to use your local Gello instead of remote one. By using the local one, you won't be
-syncing other chromium / swe sources too.
+If you're working on the Gello channel, you may want to use your local channel instead of Lineage one. 
 
     export WITH_GELLO_SOURCE=true
-    export LOCAL_GELLO=true
+    croot
+    cd external/gello-build/env/swe/channels
+    rm -rf lineage
+    git clone https://your.git.repo/my_cool_channel lineage 
     mka Gello
 
 Setup
diff --git a/env/.gclient b/env/.gclient
index 7d5460a..ad262c5 100644
--- a/env/.gclient
+++ b/env/.gclient
@@ -1,13 +1,9 @@
 solutions = [
   { "name"        : "src",
-    "url"         : "git://codeaurora.org/quic/chrome4sdp/chromium/src.git@refs/remotes/origin/m42",
+    "url"         : "git://codeaurora.org/quic/chrome4sdp/chromium/src.git@refs/remotes/origin/m58",
     "deps_file"   : "DEPS",
-    "managed"     : True,
-    "safesync_url": "",
     "managed"     : False,
-    "custom_deps" : {
-        "src/swe/browser" : "https://github.com/CyanogenMod/android_packages_apps_gello.git@refs/remotes/origin/cm-13.0"
-    }
+    "safesync_url": "",
   },
 ]
 target_os = ["android"]
diff --git a/gello_build.sh b/gello_build.sh
index 2805061..35fd952 100755
--- a/gello_build.sh
+++ b/gello_build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
 #  Copyright (C) 2016 The CyanogenMod Project
+#  Copyright (C) 2017 The LineageOS Project
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -47,16 +48,22 @@ function sync() {
         rm -rf $SRC_GELLO/out
         find $TOP_GELLO -name index.lock -exec rm {} \;
         gclient recurse git clean -fdx .
-
+    fi
+    
+    if [ -d "$TOP_GELLO/env/swe/channels/lineage" ]; then
+        rm -rf $TOP_GELLO/env/swe/channels/lineage
     fi
 
     if [ "$NOSYNC" != true ]; then
         cd $TOP_GELLO/env
 
         echo "Syncing now!"
-        gclient sync -n --no-nag-max
+        GYP_CHROMIUM_NO_ACTION=1 gclient sync -n --no-nag-max
         local SYNCRET=$?
 
+        cd swe/channels
+        git clone https://github.com/LineageOS/gello_channel lineage
+
         if [ "$CLEAN" == true ] && [ "$SYNCRET" == 0 ]; then
             gclient recurse git clean -fdx .
             return $?
@@ -75,7 +82,6 @@ function sync() {
 function setup() {
     local DONE_FILE=$TOP_GELLO/.cm_done
     local GOOGLE_SDK=$SRC_GELLO/third_party/android_tools/sdk/extras/google/google_play_services
-    local LOCAL_GELLO=$TOP_GELLO/../../packages/apps/Gello
 
     cd $SRC_GELLO
 
@@ -83,34 +89,20 @@ function setup() {
         touch $DONE_FILE
     fi
 
-    . build/android/envsetup.sh
-
-    # If local is enabled we will be using local gello shell instead of synced one
-    if [ "$LOCAL" == true ]; then
-        if [ -d $LOCAL_GELLO ]; then
-            if [ -d $BUILD_GELLO ]; then
-                mv $BUILD_GELLO $BACKUP_GELLO
-            fi
-            cp -r $LOCAL_GELLO $BUILD_GELLO
-        else
-            echo "No local Gello found (excepted to be at $LOCAL_GELLO)"
-            return 4
-        fi
+    # If we don't have Google SDKs, get them
+    # !! This asks a manual input to accept licenses !!
+    if [ ! -d $GOOGLE_SDK ]; then
+        bash $SRC_GELLO/build/install-android-sdks.sh
     fi
 
+    . build/android/envsetup.sh
+
     if [ "$FAST" != true ] && [ -f $DONE_FILE ]; then
-        # !! The first time it asks a manual input to accept licenses !!
-        GYP_DEFINES="$GYP_DEFINES OS=android swe_channel=cm" gclient runhooks
+        GYP_CHROMIUM_NO_ACTION=1 gn gen out/Release --args='swe_channels="lineage" target_os="android" is_debug=false symbol_level=0'
         return $?
     else
         return 0
     fi
-
-    # If we don't have Google SDKs, get them
-    # !! This asks a manual input to accept licenses !!
-    if [ ! -d $GOOGLE_SDK ]; then
-        bash $SRC_GELLO/build/install-android-sdks.sh
-    fi
 }
 
 
@@ -167,10 +159,6 @@ function parseflags() {
             --clean)
                 CLEAN=true
                 ;;
-            --local)
-                NOSYNC=true
-                LOCAL=true
-                ;;
         esac
     done
 }
@@ -203,12 +191,12 @@ function pathvalidator() {
 function helpgello() {
     cat<<EOF
 Gello inline build system (c) CyanogenMod 2016
+                          (c) LineageOS 2017
 Usage: ./gello_build.sh <flags>
 flags:
     --clean       = Make a clean build
     --depot       = Install Depot Tool
     --fast        = Skip sync and runhooks, useful for testing local changes
-    --local       = Pick local gello from packages/apps/Gello (for testing purpose)
     --no-sync     = Skip sync
 EOF
 }