Extract class Framework from AndrolibResources (#3105)

This commit is contained in:
sv99
2023-06-27 17:51:26 +03:00
committed by GitHub
parent 9c495cae29
commit 40d427e5bd
6 changed files with 261 additions and 224 deletions

View File

@ -18,6 +18,7 @@ package brut.androlib;
import brut.androlib.exceptions.AndrolibException;
import brut.androlib.res.AndrolibResources;
import brut.androlib.res.Framework;
import brut.common.BrutException;
import brut.directory.DirUtil;
import brut.directory.Directory;
@ -138,8 +139,8 @@ public abstract class TestUtils {
static File getFrameworkDirectory() throws AndrolibException {
Config config = Config.getDefaultConfig();
AndrolibResources androlibResources = new AndrolibResources(config);
return androlibResources.getFrameworkDirectory();
Framework framework = new Framework(config);
return framework.getFrameworkDirectory();
}
public static class ResValueElementQualifier implements ElementQualifier {

View File

@ -19,6 +19,7 @@ package brut.androlib.aapt1;
import brut.androlib.*;
import brut.androlib.exceptions.AndrolibException;
import brut.androlib.res.AndrolibResources;
import brut.androlib.res.Framework;
import brut.directory.ExtFile;
import brut.common.BrutException;
import brut.util.OS;
@ -55,7 +56,7 @@ public class SharedLibraryTest extends BaseTest {
config.frameworkDirectory = sTmpDir.getAbsolutePath();
config.frameworkTag = "building";
new AndrolibResources(config).installFramework(new File(sTmpDir + File.separator + apkName));
new Framework(config).installFramework(new File(sTmpDir + File.separator + apkName));
assertTrue(fileExists("2-building.apk"));
}
@ -67,7 +68,7 @@ public class SharedLibraryTest extends BaseTest {
Config config = Config.getDefaultConfig();
config.frameworkDirectory = sTmpDir.getAbsolutePath();
new AndrolibResources(config).installFramework(new File(sTmpDir + File.separator + apkName));
new Framework(config).installFramework(new File(sTmpDir + File.separator + apkName));
assertTrue(fileExists("2.apk"));
}
@ -83,7 +84,7 @@ public class SharedLibraryTest extends BaseTest {
config.frameworkTag = "shared";
// install library/framework
new AndrolibResources(config).installFramework(new File(sTmpDir + File.separator + library));
new Framework(config).installFramework(new File(sTmpDir + File.separator + library));
assertTrue(fileExists("2-shared.apk"));
// decode client.apk