Merge remote-tracking branch 'upstream/master'

peaktogooo · Jul 16, 2018 · 0ccccce · 0ccccce
2 parents 316a540 + c2e673f
commit 0ccccce
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/build.py b/build.py
@@ -42,6 +42,7 @@ def header(str):
 	ndk_build = os.path.join(os.environ['ANDROID_HOME'], 'ndk-bundle', 'ndk-build')
 
 cpu_count = multiprocessing.cpu_count()
+gradlew = os.path.join('.', 'gradlew.bat' if os.name == 'nt' else 'gradlew')
 archs = ['arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64']
 
 def mv(source, target):
@@ -203,7 +204,7 @@ def build_apk(args):
 		if not os.path.exists('release-key.jks'):
 			error('Please generate a java keystore and place it in \'release-key.jks\'')
 
-		proc = subprocess.run('{} app:assembleRelease'.format(os.path.join('.', 'gradlew.bat' if os.name == 'nt' else 'gradlew')), shell=True, stdout=STDOUT)
+		proc = subprocess.run('{} app:assembleRelease'.format(gradlew), shell=True, stdout=STDOUT)
 		if proc.returncode != 0:
 			error('Build Magisk Manager failed!')
 
@@ -219,7 +220,7 @@ def build_apk(args):
 		header('Output: ' + release)
 		rm(unsigned)
 	else:
-		proc = subprocess.run('{} app:assembleDebug'.format(os.path.join('.', 'gradlew.bat' if os.name == 'nt' else 'gradlew')), shell=True, stdout=STDOUT)
+		proc = subprocess.run('{} app:assembleDebug'.format(gradlew), shell=True, stdout=STDOUT)
 		if proc.returncode != 0:
 			error('Build Magisk Manager failed!')
 
@@ -234,7 +235,7 @@ def build_apk(args):
 		header('Output: ' + target)
 
 def build_snet(args):
-	proc = subprocess.run('{} snet:assembleRelease'.format(os.path.join('.', 'gradlew.bat' if os.name == 'nt' else 'gradlew')), shell=True, stdout=STDOUT)
+	proc = subprocess.run('{} snet:assembleRelease'.format(gradlew), shell=True, stdout=STDOUT)
 	if proc.returncode != 0:
 		error('Build snet extention failed!')
 	source = os.path.join('snet', 'build', 'outputs', 'apk', 'release', 'snet-release-unsigned.apk')
@@ -390,7 +391,7 @@ def sign_adjust_zip(unsigned, output):
 
 	if not os.path.exists(jarsigner):
 		header('* Building ' + signer_name)
-		proc = subprocess.run('{} utils:shadowJar'.format(os.path.join('.', 'gradlew.bat' if os.name == 'nt' else 'gradlew')), shell=True, stdout=STDOUT)
+		proc = subprocess.run('{} utils:shadowJar'.format(gradlew), shell=True, stdout=STDOUT)
 		if proc.returncode != 0:
 			error('Build {} failed!'.format(signer_name))
 

diff --git a/native/jni/core/daemon.c b/native/jni/core/daemon.c
@@ -122,6 +122,7 @@ void main_daemon() {
 
 	// Start the log monitor
 	loggable = exec_command_sync("/system/bin/logcat", "-d", "-f", "/dev/null", NULL) == 0;
+	chmod("/dev/null", 0666);
 	if (loggable) {
 		connect_daemon2(LOG_DAEMON, &fd);
 		write_int(fd, HANDSHAKE);

diff --git a/native/jni/core/log_daemon.c b/native/jni/core/log_daemon.c
@@ -135,6 +135,7 @@ void log_daemon() {
 		if (exec_command_sync("/system/bin/logcat", "-b", b[i], "-d", "-f", "/dev/null", NULL) == 0)
 			vec_push_back_all(&log_cmd, "-b", b[i], NULL);
 	}
+	chmod("/dev/null", 0666);
 	vec_dup(&log_cmd, &clear_cmd);
 	vec_push_back_all(&log_cmd, "-v", "threadtime", "-s", "am_proc_start", "Magisk", "*:F", NULL);
 	vec_push_back(&log_cmd, NULL);

diff --git a/native/jni/include/magiskrc.h b/native/jni/include/magiskrc.h
@@ -14,7 +14,7 @@ const char magiskrc[] =
 "   rm "UNBLOCKFILE"\n"
 "   start magisk_startup\n"
 "   wait "UNBLOCKFILE" 10\n"
-"   rm /dev/.magisk.unblock\n"
+"   rm "UNBLOCKFILE"\n"
 "\n"
 
 // Services