-
Notifications
You must be signed in to change notification settings - Fork 5
/
build_make.diff
96 lines (90 loc) · 4.43 KB
/
build_make.diff
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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
diff --git a/envsetup.sh b/envsetup.sh
index 03ef64e95f..b189c50772 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -769,17 +769,17 @@ function lunch()
if ! check_product $product
then
- # if we can't find a product, try to grab it off the LineageOS GitHub
- T=$(gettop)
- cd $T > /dev/null
- vendor/lineage/build/tools/roomservice.py $product
- cd - > /dev/null
- check_product $product
- else
- T=$(gettop)
- cd $T > /dev/null
- vendor/lineage/build/tools/roomservice.py $product true
- cd - > /dev/null
+ # if we can't find a product, stop build and warn
+ echo -e "\033[1;31m ################################################################\033[m" >&2
+ echo -e "\033[1;31m \033[m" >&2
+ echo -e "\033[1;31m E R R O R ! \033[m" >&2
+ echo -e "\033[1;31m \033[m" >&2
+ echo -e "\033[1;31m Don't have a product spec for: '$product'. \033[m" >&2
+ echo -e "\033[1;31m Please put your repo manifest like \033[m" >&2
+ echo -e "\033[1;31m '.repo/local_manifests/codename.xml' \033[m" >&2
+ echo -e "\033[1;31m \033[m" >&2
+ echo -e "\033[1;31m ################################################################\033[m" >&2
+ return 1
fi
TARGET_PRODUCT=$product \
@@ -2002,22 +2002,6 @@ validate_current_shell
source_vendorsetup
addcompletions
-# check and set ccache path on envsetup
-if [ -z ${CCACHE_EXEC} ]; then
- ccache_path=$(which ccache)
- if [ ! -z "$ccache_path" ]; then
- export USE_CCACHE=1
- export CCACHE_EXEC="$ccache_path"
- if [ -z ${CCACHE_DIR} ]; then
- export CCACHE_DIR=${HOME}/.ccache
- fi
- $ccache_path -o compression=true
- echo -e "ccache enabled and CCACHE_EXEC has been set to : $ccache_path"
- else
- echo -e "ccache not found installed!"
- fi
-fi
-
export ANDROID_BUILD_TOP=$(gettop)
. $ANDROID_BUILD_TOP/vendor/lineage/build/envsetup.sh
diff --git a/tools/releasetools/non_ab_ota.py b/tools/releasetools/non_ab_ota.py
index eb9ea9f375..3cb40181cd 100644
--- a/tools/releasetools/non_ab_ota.py
+++ b/tools/releasetools/non_ab_ota.py
@@ -222,19 +222,13 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
script.Print("Target: {}".format(target_info.fingerprint))
# Build info
- script.Print(" ");
- script.Print(" _____ _ _ ");
- script.Print(" | __ \ (_) | | ");
- script.Print(" ___ _ __| | | |_ __ ___ _ __| | ");
- script.Print(" / __| '__| | | | '__/ _ \| |/ _\`| ");
- script.Print(" | (__| | | |__| | | | (_) | | (_| | ");
- script.Print(" \___|_| |_____/|_|_ \___/|_|\__,_| _ ");
- script.Print(" /\ | | (_) | |");
- script.Print(" / \ _ __ __| |_ __ ___ _ __| |");
- script.Print(" / /\ \ | '_ \ / _\`| '__/ _ \| |/ _\`|");
- script.Print(" / ____ \| | | | (_| | | | (_) | | (_| |");
- script.Print(" /_/ \_\_| |_|\__,_|_| \___/|_|\__,_|");
- script.Print(" ");
+ script.Print(" ______ _ _ ");
+ script.Print(" | ____| | | | ");
+ script.Print(" | |__ | | ___ | | _____ ");
+ script.Print(" | __| | |/ _ \| |/ / _ \ ");
+ script.Print(" | | | | (_) | < (_) | ");
+ script.Print(" |_| |_|\___/|_|\_\___/ ");
+ script.Print(" ");
buildid = target_info.GetBuildProp("ro.modversion")
androidver = target_info.GetBuildProp("ro.build.version.release")
@@ -244,7 +238,7 @@ else if get_stage("%(bcb_dev)s") == "3/3" then
device = target_info.GetBuildProp("ro.build.product")
manufacturer = target_info.GetBuildProp("ro.product.manufacturer")
script.Print("***********************************************");
- script.Print(" ROM version : %s"%(buildid));
+ script.Print(" FlokoROM version : %s"%(buildid));
script.Print(" Android version : %s"%(androidver));
script.Print(" Security patch : %s"%(securep));
script.Print(" Build date : %s"%(buildday));