Fix javelinanddart's shit

Signed-off-by: Paul Keith <javelinanddart@bestas.gr>
此提交包含在:
Luca Stefani
2017-04-06 12:26:57 -05:00
提交者 Paul Keith
父節點 19faa4451d
當前提交 564bc97ae4
共有 2 個檔案被更改,包括 12 行新增12 行删除

14
build/gapps.sh 一般檔案 → 可執行檔
查看文件

@@ -18,27 +18,27 @@ GLOG=/tmp/gapps_log
## ##
# functions # functions
# #
function printerr(){ function printerr() {
echo "$(tput setaf 1)$1$(tput sgr 0)" echo "$(tput setaf 1)$1$(tput sgr 0)"
} }
function printdone(){ function printdone() {
echo "$(tput setaf 2)$1$(tput sgr 0)" echo "$(tput setaf 2)$1$(tput sgr 0)"
} }
function clean(){ function clean() {
echo "Cleaning up..." echo "Cleaning up..."
rm -r $OUT/$GARCH rm -r $OUT/$GARCH
rm /tmp/$BUILDZIP rm /tmp/$BUILDZIP
return $? return $?
} }
function Gfailed(){ function Gfailed() {
printerr "Build failed, check $GLOG" printerr "Build failed, check $GLOG"
exit 1 exit 1
} }
function create(){ function create() {
test -f $GLOG && rm -f $GLOG test -f $GLOG && rm -f $GLOG
echo "Starting GApps compilation" > $GLOG echo "Starting GApps compilation" > $GLOG
echo "ARCH= $GARCH" >> $GLOG echo "ARCH= $GARCH" >> $GLOG
@@ -55,7 +55,7 @@ function create(){
cp -r $COMMON $OUT/$GARCH >> $GLOG cp -r $COMMON $OUT/$GARCH >> $GLOG
} }
function zipit(){ function zipit() {
BUILDZIP=gapps-$ANDROIDV-$GARCH-$DATE.zip BUILDZIP=gapps-$ANDROIDV-$GARCH-$DATE.zip
echo "Importing installation scripts..." echo "Importing installation scripts..."
cp -r $METAINF $OUT/$GARCH/META-INF && echo "Meta copied" >> $GLOG cp -r $METAINF $OUT/$GARCH/META-INF && echo "Meta copied" >> $GLOG
@@ -74,7 +74,7 @@ function zipit(){
fi fi
} }
function getmd5(){ function getmd5() {
if [ -x $(which md5sum) ]; then if [ -x $(which md5sum) ]; then
echo "md5sum is installed, getting md5..." >> $GLOG echo "md5sum is installed, getting md5..." >> $GLOG
echo "Getting md5sum..." echo "Getting md5sum..."

查看文件

@@ -5,18 +5,18 @@ BUILD_GAPPS := $(BUILD_SYSTEM)/gapps.sh
OUTDIR := $(TOPDIR)/out OUTDIR := $(TOPDIR)/out
LOG_BUILD := /tmp/gapps_log LOG_BUILD := /tmp/gapps_log
distclean : distclean:
@rm -fr $(OUTDIR) @rm -fr $(OUTDIR)
@echo "$(tput setaf 2)Output removed! Ready for a clean build$(tput sgr 0)" @echo "Output removed! Ready for a clean build"
arm : gapps_arm:
@echo "Compiling GApps for arm..." @echo "Compiling GApps for arm..."
@bash $(BUILD_GAPPS) arm 2>&1 @bash $(BUILD_GAPPS) arm 2>&1
arm64 : gapps_arm64:
@echo "Compiling GApps for arm64..." @echo "Compiling GApps for arm64..."
@bash $(BUILD_GAPPS) arm64 2>&1 @bash $(BUILD_GAPPS) arm64 2>&1
x86 : gapps_x86:
@echo "Compiling GApps for x86..." @echo "Compiling GApps for x86..."
@bash $(BUILD_GAPPS) x86 2>&1 @bash $(BUILD_GAPPS) x86 2>&1