summaryrefslogtreecommitdiff
path: root/marshmallow-gcc5-patchset
blob: ae0363b22d2fea3f1f7fe5c3e4c9e02d95860ec1 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
#!/bin/sh

. $(dirname $0)/functions

PATCHES=0
if [ -n "$1" ]; then
        AOSP="$1"
else
        AOSP="`pwd`"
fi

if ! [ -d "$AOSP" ] && ! [ -d "$AOSP/bionic" ] && [ -d "$AOSP"/build ]; then
        echo "This script must be run from the AOSP source directory"
        echo "or with the AOSP source directory as its first parameter."
        exit 1
fi

# Fix libatomic.a detection with gcc 5+
# Not submitted upstream yet, looking for a cleaner solution.
# (But this one works without drawbacks)
apply --linaro build 16156/1
# Fix uchar.h for use with gcc 5+
# Accepted upstream, already on master
apply --linaro bionic 16161/1
# Fix gcc 5+ compiler warning in code built with -Werror
# Submitted upstream, not yet accepted
# https://android-review.googlesource.com/175288
apply frameworks/base 175288/1
# Fix build with gcc 5+
# Not yet submitted upstream, need to check if it breaks gcc 4.x
apply --linaro external/compiler-rt 16187/1
apply --linaro external/compiler-rt 16230/1

# Optional components -- let's fix them only if they're checked out
if [ -d "$AOSP/external/powerdebug" ]; then
	apply --linaro external/powerdebug 16185/1
fi