blob: 4ce0192725b1e46df1b7e3ca05efc3e5fb00a7c7 (
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
38
39
40
41
42
43
44
45
46
47
48
|
#!/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 2.6.0
if [ -d "${AOSP}/optee/optee_os" ]; then
## mk/aosp_optee.mk: define OPTEE_BIN for path of tee.bin
cherrypick optee/optee_os 2ef721a76a1a09ec8ec398aeee64449eb692dd91
## compiler.h: Avoid macro redefinition
cherrypick optee/optee_os decd9df74653f63131ae57fee191b91274f35d4e
## 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/liuyq/optee_os/commit/387474992e4d477b3dc053888e1be67caf905ec0
curl_am https://github.com/liuyq/optee_os/commit/387474992e4d477b3dc053888e1be67caf905ec0.patch optee/optee_os
fi
if [ -d "${AOSP}/external/optee_test" ]; then
## Android.mk: change to use OPTEE_BIN instead of BUILD_OPTEE_OS
cherrypick external/optee_test b31d4a96882bf0036e518c40500b35a788b0c120
## Android.mk: workaround missing-field-initializers error
cherrypick external/optee_test ea8378202c56b6163749bea575313c725322b874
fi
|
