From 2cfd7d04e7469d1ad39fb9f35aa342c590894b2f Mon Sep 17 00:00:00 2001 From: Shauli Bracha Date: Mon, 25 Feb 2019 15:17:51 +0200 Subject: [PATCH 1/3] supolicy: added system_app to mlstrustedsubject --- Core/template_override/common/post-fs-data.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/template_override/common/post-fs-data.sh b/Core/template_override/common/post-fs-data.sh index 271effea..ff323c50 100644 --- a/Core/template_override/common/post-fs-data.sh +++ b/Core/template_override/common/post-fs-data.sh @@ -18,7 +18,7 @@ supolicy --live "allow coredomain coredomain process {execmem}" # read configs set in our app supolicy --live "allow {zygote system_server} app_data_file * *" -supolicy --live "attradd platform_app mlstrustedsubject" +supolicy --live "attradd {systen_app platform_app} mlstrustedsubject" # read module apk file in zygote supolicy --live "allow zygote apk_data_file * *" From 87be1650f1ea226c439f2e281c575d5aece7055d Mon Sep 17 00:00:00 2001 From: Shauli Bracha Date: Mon, 25 Feb 2019 15:25:46 +0200 Subject: [PATCH 2/3] Update post-fs-data.sh --- Core/template_override/common/post-fs-data.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/template_override/common/post-fs-data.sh b/Core/template_override/common/post-fs-data.sh index ff323c50..0dd4bef7 100644 --- a/Core/template_override/common/post-fs-data.sh +++ b/Core/template_override/common/post-fs-data.sh @@ -18,7 +18,7 @@ supolicy --live "allow coredomain coredomain process {execmem}" # read configs set in our app supolicy --live "allow {zygote system_server} app_data_file * *" -supolicy --live "attradd {systen_app platform_app} mlstrustedsubject" +supolicy --live "attradd {system_app platform_app} mlstrustedsubject" # read module apk file in zygote supolicy --live "allow zygote apk_data_file * *" From 88bf7166634dbea55b375a94eae549e5b8b52fb2 Mon Sep 17 00:00:00 2001 From: Shauli Bracha Date: Wed, 27 Mar 2019 09:40:41 +0200 Subject: [PATCH 3/3] Fixed building on Windows environment --- dalvikdx/build.gradle | 6 +++++- dexmaker/build.gradle | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dalvikdx/build.gradle b/dalvikdx/build.gradle index 5d64c3a3..b031d497 100644 --- a/dalvikdx/build.gradle +++ b/dalvikdx/build.gradle @@ -1,3 +1,4 @@ +import org.gradle.internal.os.OperatingSystem apply plugin: 'java-library' dependencies { @@ -13,7 +14,10 @@ task dexInJar(type: Jar) { doFirst { exec { workingDir jar.destinationDir - executable "dx" + if (OperatingSystem.current().isWindows()) + executable "dx.bat" + else + executable "dx" args "--dex", "--output", "classes.dex", "${jar.archiveName}" } } diff --git a/dexmaker/build.gradle b/dexmaker/build.gradle index 319198e1..8642d24e 100644 --- a/dexmaker/build.gradle +++ b/dexmaker/build.gradle @@ -1,3 +1,4 @@ +import org.gradle.internal.os.OperatingSystem apply plugin: 'java' description = "A utility for doing compile or runtime code generation targeting Android's Dalvik VM" @@ -18,7 +19,10 @@ task dexInJar(type: Jar) { doFirst { exec { workingDir jar.destinationDir - executable "dx" + if (OperatingSystem.current().isWindows()) + executable "dx.bat" + else + executable "dx" args "--dex", "--output", "classes.dex", "${jar.archiveName}" } }