Skip to content

Commit 3aa7e49

Browse files
committed
Move up to clang-r346389c
Remove 4.19 experimental code which was commented out Comment out steps that when skipping downloading source to make mproper only
1 parent aff3df0 commit 3aa7e49

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

hikey-kernel-builder.sh

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ usage()
1515
set -ex
1616

1717
# export TOOLCHAIN="clang-4679922"
18-
export TOOLCHAIN="clang-r346389b"
18+
# export TOOLCHAIN="clang-r346389b"
19+
export TOOLCHAIN="clang-r346389c"
1920
export nproc=9
2021
export ANDROID_VERSION="O-MR1"
2122
export REFERENCE_BUILD_URL="http://testdata.linaro.org/lkft/aosp-stable/android-8.1.0_r29/"
@@ -152,21 +153,14 @@ if [ "$skipdownloads" = "1" ]; then
152153
git merge --no-edit remotes/origin/${UPSTREAM_KERNEL_BRANCH}
153154
fi
154155
make mrproper
155-
git checkout master
156-
git clean -fd
157-
git pull
158-
git checkout "$KERNEL_BRANCH"
159-
git pull
156+
# git checkout master
157+
# git clean -fd
158+
# git pull
159+
# git checkout "$KERNEL_BRANCH"
160+
# git pull
160161

161162
else
162163

163-
# if [ "$VERSION" = "4.19" ]; then
164-
# git clone https://git.linaro.org/people/john.stultz/android-dev.git
165-
# mv android-dev hikey-linaro
166-
# cd "$KERNEL_DIR"
167-
# git checkout -b experimental/android-hikey-linaro-4.19 origin/experimental/android-hikey-linaro-4.19
168-
169-
# else
170164
git clone https://android.googlesource.com/kernel/hikey-linaro
171165
cd "$KERNEL_DIR"
172166
git checkout -b "$KERNEL_BRANCH" origin/"$KERNEL_BRANCH"
@@ -188,7 +182,6 @@ else
188182
fi
189183
fi
190184

191-
# fi
192185
fi
193186
cd ..
194187

0 commit comments

Comments
 (0)