revert to not using additional key in package.json in order to extract sshots

Author: petekanev

build/project-template-gradle/src/main/java/com/tns/RuntimeHelper.java

@@ -4,140 +4,136 @@
 
 import android.app.Application;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 import java.io.IOException;
 
-public class RuntimeHelper
-{
+public class RuntimeHelper {
 	private final Application app;
-	
-	public RuntimeHelper(Application app)
-	{
+
+	public RuntimeHelper(Application app) {
 		this.app = app;
 	}
-	
-	// hasErrorIntent tells you if there was an event (with an uncaught exception) raised from ErrorReport
-	public boolean hasErrorIntent()
-	{
+
+	// hasErrorIntent tells you if there was an event (with an uncaught
+	// exception) raised from ErrorReport
+	public boolean hasErrorIntent() {
 		boolean hasErrorIntent = false;
-		
-		try
-		{
-			 //empty file just to check if there was a raised uncaught error by ErrorReport
+
+		try {
+			// empty file just to check if there was a raised uncaught error by
+			// ErrorReport
 			File errFile = new File(app.getFilesDir(), ErrorReport.ERROR_FILE_NAME);
-			
-			if (errFile.exists())
-			{
+
+			if (errFile.exists()) {
 				errFile.delete();
 				hasErrorIntent = true;
 			}
-		}
-		catch (Exception e)
-		{
+		} catch (Exception e) {
 			Log.d(logTag, e.getMessage());
 		}
-		
+
 		return hasErrorIntent;
 	}
-	
-	public void initRuntime()
-	{
+
+	public void initRuntime() {
 		System.loadLibrary("NativeScript");
-		
+
 		Logger logger = new LogcatLogger(app);
 		Debugger debugger = new AndroidJsDebugger(app, logger);
-		
+
 		boolean showErrorIntent = hasErrorIntent();
-		if (!showErrorIntent)
-		{
+		if (!showErrorIntent) {
 			NativeScriptUncaughtExceptionHandler exHandler = new NativeScriptUncaughtExceptionHandler(logger, app);
 
 			Thread.setDefaultUncaughtExceptionHandler(exHandler);
-			
+
 			Async.Http.setApplicationContext(this.app);
-			
-			ExtractPolicy extractPolicy = new DefaultExtractPolicy(logger);
+
+			DefaultExtractPolicy extractPolicy = new DefaultExtractPolicy(logger);
 			boolean skipAssetExtraction = Util.runPlugin(logger, app);
-			if (!skipAssetExtraction)
-			{
-				new AssetExtractor(null, logger).extractAssets(app, extractPolicy);
-			}
-			
+
 			String appName = app.getPackageName();
 			File rootDir = new File(app.getApplicationInfo().dataDir);
 			File appDir = app.getFilesDir();
-			
-			try
-			{
+
+			try {
 				appDir = appDir.getCanonicalFile();
+			} catch (IOException e1) {
 			}
-			catch (IOException e1)
-			{
+
+			if (!skipAssetExtraction) {
+				if(logger.isEnabled()) {
+					logger.write("Extracting assets...");
+				}
+				
+				AssetExtractor aE = new AssetExtractor(null, logger);
+				
+				String outputDir = app.getFilesDir().getPath() + File.separator;
+
+				aE.extractAssets(app, "app", outputDir, extractPolicy);
+				aE.extractAssets(app, "internal", outputDir, extractPolicy);
+				aE.extractAssets(app, "metadata", outputDir, extractPolicy);
+
+				// enable with flags?
+				boolean shouldExtractSnapshots = true;
+				
+				// will extract snapshot of the device appropriate architecture
+				if(shouldExtractSnapshots) {
+					if(logger.isEnabled()) {
+						logger.write("Extracting snapshot blob");
+					}
+
+					aE.extractAssets(app,  "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy);
+				}
+
+				extractPolicy.setAssetsThumb(app);
 			}
 
+			Object[] v8Config = V8Config.fromPackageJSON(appDir);
+			
 			ClassLoader classLoader = app.getClassLoader();
 			File dexDir = new File(rootDir, "code_cache/secondary-dexes");
 			String dexThumb = null;
-			try
-			{
+			try {
 				dexThumb = Util.getDexThumb(app);
-			}
-			catch (NameNotFoundException e)
-			{
-				if (logger.isEnabled()) logger.write("Error while getting current proxy thumb");
+			} catch (NameNotFoundException e) {
+				if (logger.isEnabled())
+					logger.write("Error while getting current proxy thumb");
 				e.printStackTrace();
 			}
 			ThreadScheduler workThreadScheduler = new WorkThreadScheduler(new Handler(Looper.getMainLooper()));
-			Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir, appDir, classLoader, dexDir, dexThumb);
+			Configuration config = new Configuration(workThreadScheduler, logger, debugger, appName, null, rootDir,
+					appDir, classLoader, dexDir, dexThumb, v8Config);
 			Runtime runtime = new Runtime(config);
-			
+
 			exHandler.setRuntime(runtime);
-			
-			if (NativeScriptSyncService.isSyncEnabled(this.app))
-			{
+
+			if (NativeScriptSyncService.isSyncEnabled(this.app)) {
 				NativeScriptSyncService syncService = new NativeScriptSyncService(runtime, logger, this.app);
 
 				syncService.sync();
 				syncService.startServer();
 
 				// preserve this instance as strong reference
-				// do not preserve in NativeScriptApplication field inorder to make the code more portable
+				// do not preserve in NativeScriptApplication field inorder to
+				// make the code more portable
 				// @@@
-				//Runtime.getOrCreateJavaObjectID(syncService);
-			}
-			else
-			{
-				if (logger.isEnabled())
-				{
+				// Runtime.getOrCreateJavaObjectID(syncService);
+			} else {
+				if (logger.isEnabled()) {
 					logger.write("NativeScript LiveSync is not enabled.");
 				}
 			}
-			
+
 			runtime.init();
 			runtime.runScript(new File(appDir, "internal/ts_helpers.js"));
 			Runtime.initInstance(this.app);
 			runtime.run();
 		}
 	}
-	
-/*	public static boolean isDebuggableApp(Context context)
-	{
-		int flags;
-		try
-		{
-			flags = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).applicationInfo.flags;
-		}
-		catch (NameNotFoundException e)
-		{
-			flags = 0;
-			e.printStackTrace();
-		}
 
-		boolean isDebuggableApp = ((flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0);
-		return isDebuggableApp;
-	}*/
-	
 	private final String logTag = "MyApp";
 }

src/src/com/tns/V8Config.java

@@ -11,8 +11,6 @@ class V8Config
 	private static final String AndroidKey = "android";
 	private static final String V8FlagsKey = "v8Flags";
 	private static final String CodeCacheKey = "codeCache";
-	// TODO: EnableHeapSnapshotKey is subject to approval and change
-	private static final String EnableHeapSnapshotKey = "heapSnapshotEnable";
 	private static final String HeapSnapshotScriptKey = "heapSnapshotScript";
 	private static final String HeapSnapshotBlobKey = "heapSnapshotBlob";
 	private static final String SnapshotFile = "snapshot.blob";
@@ -63,10 +61,6 @@ public static Object[] fromPackageJSON(File appDir)
 				{
 					result[4] = androidObject.getString(ProfilerOutputDirKey);
 				}
-				if(androidObject.has(EnableHeapSnapshotKey))
-				{
-					result[5] = androidObject.getBoolean(EnableHeapSnapshotKey);
-				}
 			}
 		}
 		catch (Exception e)
@@ -89,9 +83,7 @@ private static Object[] makeDefaultOptions()
 			// a binary file containing an already saved snapshot
 			"",
 			// V8 profiler output directory
-			"",
-			// enable heapsnapshots extraction, false by default 
-			false
+			""
 		};
 
 		return result;

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

@@ -64,8 +64,6 @@ public void initRuntime() {
 			} catch (IOException e1) {
 			}
 
-			Object[] v8Config = V8Config.fromPackageJSON(appDir);
-			
 			if (!skipAssetExtraction) {
 				if(logger.isEnabled()) {
 					logger.write("Extracting assets...");
@@ -79,20 +77,22 @@ public void initRuntime() {
 				aE.extractAssets(app, "internal", outputDir, extractPolicy);
 				aE.extractAssets(app, "metadata", outputDir, extractPolicy);
 
-				// at earlier point the package.json will not have been extracted, so we now fetch the real, non-default values from the file
-				v8Config = V8Config.fromPackageJSON(appDir);
+				// enable with flags?
+				boolean shouldExtractSnapshots = true;
 
-				boolean shouldExtractSnapshots = (Boolean)v8Config[5];
+				// will extract snapshot of the device appropriate architecture
 				if(shouldExtractSnapshots) {
 					if(logger.isEnabled()) {
 						logger.write("Extracting snapshot blob");
 					}
 
-					aE.extractAssets(app,  "snapshots/" + Build.CPU_ABI + "/snapshot.blob", outputDir, extractPolicy);
+					aE.extractAssets(app,  "snapshots/" + Build.CPU_ABI, outputDir, extractPolicy);
 				}
 
 				extractPolicy.setAssetsThumb(app);
 			}
+
+			Object[] v8Config = V8Config.fromPackageJSON(appDir);
 
 			ClassLoader classLoader = app.getClassLoader();
 			File dexDir = new File(rootDir, "code_cache/secondary-dexes");