Massive build script refactor

skuggo · Jun 3, 2017 · e780c76 · e780c76
1 parent 532c6ca
commit e780c76
Show file tree

Hide file tree

Showing 32 changed files with 543 additions and 1,384 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -10,8 +10,7 @@
 *.cmd text eol=crlf
 
 # Denote all files that are truly binary and should not be modified.
-zip_static/chromeos/** binary
-uninstaller/chromeos/** binary
+chromeos/** binary
 *.jar binary
 *.exe binary
 *.apk binary
diff --git a/.gitignore b/.gitignore
@@ -1,20 +1,7 @@
 obj/
 libs/
 *.zip
+*.jks
 
 # Copied binaries
-zip_static/arm/*
-zip_static/arm64/*
-zip_static/x86/*
-zip_static/x64/*
-uninstaller/arm/*
-uninstaller/arm64/*
-uninstaller/x86/*
-uninstaller/x64/*
 ziptools/zipadjust
-
-# Generated scripts
-uninstaller/common/
-zip_static/common/*.sh
-zip_static/common/*.rc
-zip_static/META-INF/com/google/android/update-binary
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "jni/magiskpolicy"]
 	path = jni/magiskpolicy
 	url = https://github.com/topjohnwu/magiskpolicy.git
+[submodule "MagiskManager"]
+	path = MagiskManager
+	url = https://github.com/topjohnwu/MagiskManager.git
diff --git a/MagiskManager b/MagiskManager
diff --git a/build.cmd b/build.cmd