add check if snapshot blobs are enabled in package.json, and extract if true

Author: petekanev

src/jni/AssetExtractor.cpp

@@ -41,10 +41,6 @@ void AssetExtractor::ExtractAssets(JNIEnv *env, jobject obj, jstring apk, jstrin
 		zip_stat_index(z, i, ZIP_STAT_MTIME, &sb);
 		if (strstr(sb.name, prfx) == sb.name)
 		{
-
-
-			DEBUG_WRITE("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %s", sb.name);
-
 			auto name = sb.name + prefixLen; // strlen("assets/") == 7
 
 			std::string assetFullname(baseDir);

src/src/com/tns/Configuration.java

@@ -16,10 +16,11 @@ public class Configuration
 	public final ClassLoader classLoader;
 	public final File dexDir;
 	public final String dexThumb;
+	public final Object[] v8Config;
 
 	public Configuration(ThreadScheduler threadScheduler, Logger logger,  Debugger debugger,
 			String appName, File runtimeLibPath, File rootDir, File appDir, ClassLoader classLoader,
-			File dexDir, String dexThumb)
+			File dexDir, String dexThumb, Object[] v8Config)
 	{
 		this.threadScheduler = threadScheduler;
 		this.logger = logger;
@@ -31,5 +32,6 @@ public Configuration(ThreadScheduler threadScheduler, Logger logger,  Debugger d
 		this.classLoader = classLoader;
 		this.dexDir = dexDir;
 		this.dexThumb = dexThumb;
+		this.v8Config = v8Config;
 	}
 }

src/src/com/tns/Runtime.java

@@ -159,10 +159,10 @@ private boolean isInitializedImpl()
 
 	public void init()
 	{
-		init(config.threadScheduler, config.logger, config.debugger, config.appName, config.runtimeLibPath, config.rootDir, config.appDir, config.classLoader, config.dexDir, config.dexThumb);
+		init(config.threadScheduler, config.logger, config.debugger, config.appName, config.runtimeLibPath, config.rootDir, config.appDir, config.classLoader, config.dexDir, config.dexThumb, config.v8Config);
 	}
 
-	private void init(ThreadScheduler threadScheduler, Logger logger, Debugger debugger, String appName, File runtimeLibPath, File rootDir, File appDir, ClassLoader classLoader, File dexDir, String dexThumb) throws RuntimeException
+	private void init(ThreadScheduler threadScheduler, Logger logger, Debugger debugger, String appName, File runtimeLibPath, File rootDir, File appDir, ClassLoader classLoader, File dexDir, String dexThumb, Object[] v8Config) throws RuntimeException
 	{
 		if (initialized)
 		{
@@ -188,7 +188,6 @@ private void init(ThreadScheduler threadScheduler, Logger logger, Debugger debug
 		{
 			throw new RuntimeException("Fail to initialize Require class", ex);
 		}
-		Object[] v8Config = V8Config.fromPackageJSON(appDir);
 
 		if (debugger != null)//JsDebugger.isDebuggableApp(application))
 		{

test-app/src/com/tns/RuntimeHelper.java

@@ -54,8 +54,19 @@ public void initRuntime() {
 
 			DefaultExtractPolicy extractPolicy = new DefaultExtractPolicy(logger);
 			boolean skipAssetExtraction = Util.runPlugin(logger, app);
+
+			String appName = app.getPackageName();
+			File rootDir = new File(app.getApplicationInfo().dataDir);
+			File appDir = app.getFilesDir();
+
+			try {
+				appDir = appDir.getCanonicalFile();
+			} catch (IOException e1) {
+			}
+
+			Object[] v8Config = V8Config.fromPackageJSON(appDir);
+			
 			if (!skipAssetExtraction) {
-				long startTime = System.currentTimeMillis();
 				AssetExtractor aE = new AssetExtractor(null, logger);
 
 				String outputDir = app.getFilesDir().getPath() + File.separator;
@@ -64,25 +75,15 @@ public void initRuntime() {
 				aE.extractAssets(app, "internal", outputDir, extractPolicy);
 				aE.extractAssets(app, "metadata", outputDir, extractPolicy);
 
-//				if(true) {
-//					aE.extractAssets(app,  "snapshots/" + Build.CPU_ABI + "/snapshot.blob", outputDir, extractPolicy);
-//				}
+				boolean shouldExtractSnapshots = !v8Config[3].toString().isEmpty();
+				if(shouldExtractSnapshots) {
+					System.out.println("EXTRACTING A SNAPSHOT!");
+					aE.extractAssets(app,  "snapshots/" + Build.CPU_ABI + "/snapshot.blob", outputDir, extractPolicy);
+				}
 
 				extractPolicy.setAssetsThumb(app);
-				
-				long endTime = System.currentTimeMillis();
-				System.out.println("Total execution time: " + (endTime - startTime) + "ms");
 			}
-
-			String appName = app.getPackageName();
-			File rootDir = new File(app.getApplicationInfo().dataDir);
-			File appDir = app.getFilesDir();
-
-			try {
-				appDir = appDir.getCanonicalFile();
-			} catch (IOException e1) {
-			}
-
+			
 			ClassLoader classLoader = app.getClassLoader();
 			File dexDir = new File(rootDir, "code_cache/secondary-dexes");
 			String dexThumb = null;
@@ -95,7 +96,7 @@ public void initRuntime() {
 			}
 			ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));
 			Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,
-					appDir, classLoader, dexDir, dexThumb);
+					appDir, classLoader, dexDir, dexThumb, v8Config);
 			Runtime runtime = new Runtime(config);
 
 			exHandler.setRuntime(runtime);