blob: ce8d67c9e670554f12df0b0b9b7630096e439292 (
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
|
#!/bin/bash
. $(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
##################################################
################ Non-upstreamable ################
##################################################
##################################################
################ Backport ########################
##################################################
## fix android build error and xtest failures on optee-test projec
## based on the tag 3.1.0
if [ -d "${AOSP}/optee/optee_os" ]; then
## hikey: fix typo
## https://github.com/OP-TEE/optee_os/commit/9896cd2de525229faace23107557a74a0b48b8a0
cherrypick optee/optee_os 9896cd2de525229faace23107557a74a0b48b8a0
## hikey: register additional dyn shm
## https://github.com/OP-TEE/optee_os/commit/8d91fe09d1f115495f09c5791fea8431e57ecab5
cherrypick optee/optee_os 8d91fe09d1f115495f09c5791fea8431e57ecab5
fi
|
