# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271418851 -10800
# Node ID e8e63152f32039c767029ed222fd89223434f471
# Parent  21d7bcfe70dc69874831f0f0b1d57a9da97edce3
Revision: v2.1.18
Kit: 201015

diff -r 21d7bcfe70dc -r e8e63152f320 java_stubs/javadebugapi/bwins/javadebugapiu.def
--- a/java_stubs/javadebugapi/bwins/javadebugapiu.def	Fri Mar 19 09:27:45 2010 +0200
+++ b/java_stubs/javadebugapi/bwins/javadebugapiu.def	Fri Apr 16 14:54:11 2010 +0300
@@ -1,7 +1,7 @@
 EXPORTS
-	?installApp@debug@java@@YAHAAVHBufC16@@AAVTUid@@AAV?$RArray@VTUid@@@@@Z @ 1 NONAME ; int java::debug::installApp(class HBufC16 &, class TUid &, class RArray<class TUid> &)
-	?startApp@debug@java@@YAHVTUid@@AAVHBufC16@@@Z @ 2 NONAME ; int java::debug::startApp(class TUid, class HBufC16 &)
-	?stopApp@debug@java@@YAHVTUid@@@Z @ 3 NONAME ; int java::debug::stopApp(class TUid)
+	?createInstance@JavaDiagnostic@debug@java@@SAPAV123@XZ @ 1 NONAME ; class java::debug::JavaDiagnostic * java::debug::JavaDiagnostic::createInstance(void)
+	?stopApp@debug@java@@YAHVTUid@@@Z @ 2 NONAME ; int java::debug::stopApp(class TUid)
+	?startApp@debug@java@@YAHVTUid@@AAVHBufC16@@AAVTProcessId@@@Z @ 3 NONAME ; int java::debug::startApp(class TUid, class HBufC16 &, class TProcessId &)
 	?uninstallApp@debug@java@@YAHVTUid@@@Z @ 4 NONAME ; int java::debug::uninstallApp(class TUid)
-	?createInstance@JavaDiagnostic@debug@java@@SAPAV123@XZ @ 5 NONAME ; class java::debug::JavaDiagnostic * java::debug::JavaDiagnostic::createInstance(void)
+	?installApp@debug@java@@YAHAAVHBufC16@@AAVTUid@@AAV?$RArray@VTUid@@@@@Z @ 5 NONAME ; int java::debug::installApp(class HBufC16 &, class TUid &, class RArray<class TUid> &)
 
diff -r 21d7bcfe70dc -r e8e63152f320 java_stubs/javadebugapi/eabi/javadebugapiu.def
--- a/java_stubs/javadebugapi/eabi/javadebugapiu.def	Fri Mar 19 09:27:45 2010 +0200
+++ b/java_stubs/javadebugapi/eabi/javadebugapiu.def	Fri Apr 16 14:54:11 2010 +0300
@@ -1,7 +1,7 @@
 EXPORTS
 	_ZN4java5debug10installAppER7HBufC16R4TUidR6RArrayIS3_E @ 1 NONAME
 	_ZN4java5debug12uninstallAppE4TUid @ 2 NONAME
-	_ZN4java5debug7stopAppE4TUid @ 3 NONAME
-	_ZN4java5debug8startAppE4TUidR7HBufC16 @ 4 NONAME
-	_ZN4java5debug14JavaDiagnostic14createInstanceEv @ 5 NONAME
+	_ZN4java5debug14JavaDiagnostic14createInstanceEv @ 3 NONAME
+	_ZN4java5debug7stopAppE4TUid @ 4 NONAME
+	_ZN4java5debug8startAppE4TUidR7HBufC16R10TProcessId @ 5 NONAME
 
diff -r 21d7bcfe70dc -r e8e63152f320 java_stubs/javadebugapi/src/javadebugapi.cpp
--- a/java_stubs/javadebugapi/src/javadebugapi.cpp	Fri Mar 19 09:27:45 2010 +0200
+++ b/java_stubs/javadebugapi/src/javadebugapi.cpp	Fri Apr 16 14:54:11 2010 +0300
@@ -35,7 +35,7 @@
 }
 
 EXPORT_C
-TBool java::debug::startApp(TUid /*aApplicationUid*/, HBufC& /*aUeiParameters*/)
+TBool java::debug::startApp(TUid /*aApplicationUid*/, HBufC& /*aUeiParameters*/, TProcessId& /*aProcessId*/)
 {
     return EFalse;
 }
diff -r 21d7bcfe70dc -r e8e63152f320 jrt.pro
--- a/jrt.pro	Fri Mar 19 09:27:45 2010 +0200
+++ b/jrt.pro	Fri Apr 16 14:54:11 2010 +0300
@@ -22,5 +22,4 @@
 SUBDIRS += javatools 
 SUBDIRS += javaextensions 
 BLD_INF_RULES.prj_extensions += "$${LITERAL_HASH}include \"jrt_plat/group/bld.inf\""  
-BLD_INF_RULES.prj_extensions += "$${LITERAL_HASH}include \"build/stubsis/bld.inf\""  
 BLD_INF_RULES.prj_extensions += "prj_extensions" 
diff -r 21d7bcfe70dc -r e8e63152f320 jrt_plat/java_debug_api/inc/javadebugapi.h
--- a/jrt_plat/java_debug_api/inc/javadebugapi.h	Fri Mar 19 09:27:45 2010 +0200
+++ b/jrt_plat/java_debug_api/inc/javadebugapi.h	Fri Apr 16 14:54:11 2010 +0300
@@ -20,6 +20,7 @@
 #define JAVADEBUGAPI_H
 
 #include <e32cmn.h>
+#include <e32std.h>
 
 /**
  * Java Debug API allows it's users to install, remove, start and
@@ -59,6 +60,7 @@
  * Starts Java application.
  * @param[in] aApplicationUid application uid
  * @param[in] aUeiParameters includes arguments defined in Unified Emulator Interface (UEI) specification.
+ * @param[out] aProcessId process id of the launched Java application, valid if application is launched successfully
  * If aUeiParameters contains unsupported options then those options are discarded silently.
  * Supported arguments:
  *   -Xverbose[:options]
@@ -69,7 +71,7 @@
  * @capability NetworkControl
  * @return true if application is started
  */
-IMPORT_C TBool startApp(TUid aApplicationUid, HBufC& aUeiParameters);
+IMPORT_C TBool startApp(TUid aApplicationUid, HBufC& aUeiParameters, TProcessId& aProcessId);
 
 /**
  * Stops Java application.