Skip to content

add file extension for apksigner&zipalign in Windows #685

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cyrushine wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

add file extension for apksigner&zipalign in Windows #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10de186
fix incremental build - zip file is empty
Nov 1, 2021
dc61e80
fix incremental build - zip file is empty
Nov 9, 2021
87688f4
Merge pull request #661 from gdutxiaoxu/fix_incremental_build_class_n…
gryamy Nov 9, 2021
da2465e
add file extension for apksigner&zipalign in Windows
cyrushine Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...droid/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/trace/MatrixTrace.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,17 @@ class MatrixTrace(

if (isIncremental) {
val outChangedFiles = HashMap<File, Status>()

for ((changedFileInput, status) in mapOfChangedFiles) {
val changedFileInputFullPath = changedFileInput.absolutePath

// mapOfChangedFiles is contains all. each collectDirectoryInputTask should handle itself, should not handle other file
if (!changedFileInputFullPath.contains(inputFullPath)) {
continue
}

val changedFileOutput = File(changedFileInputFullPath.replace(inputFullPath, outputFullPath))

if (status == Status.ADDED || status == Status.CHANGED) {
resultOfDirInputToOut[changedFileInput] = changedFileOutput
} else if (status == Status.REMOVED) {
Expand Down
13 changes: 11 additions & 2 deletions samples/sample-android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ matrix {
sevenZipPath = "${project.configurations.sevenZipDependency.resolve().getAt(0).getAbsolutePath()}"
//Notice: You need to modify the value of $apksignerPath on different platform. the value below only suitable for Mac Platform,
//if on Windows, you may have to replace apksigner with apksigner.bat.
apksignerPath = "${android.getSdkDirectory().getAbsolutePath()}/build-tools/${android.getBuildToolsVersion()}/apksigner"
zipAlignPath = "${android.getSdkDirectory().getAbsolutePath()}/build-tools/${android.getBuildToolsVersion()}/zipalign"
apksignerPath = "${android.getSdkDirectory().getAbsolutePath()}/build-tools/${android.getBuildToolsVersion()}/apksigner${isWindows() ? ".bat" : ""}"
zipAlignPath = "${android.getSdkDirectory().getAbsolutePath()}/build-tools/${android.getBuildToolsVersion()}/zipalign${isWindows() ? ".exe" : ""}"
ignoreResources = ["R.id.*", "R.bool.*", "R.layout.unused_layout"]
}
}
Expand All @@ -186,3 +186,12 @@ project.tasks.whenTaskAdded {
}
}
}

def isWindows() {
try {
String os = System.getProperty("os.name").toLowerCase()
return os.indexOf("win") >= 0
} catch (Exception ignored) {
return false
}
}