merge in pi-release history after reset to master
diff --git a/src/share/back/DDMImpl.c b/src/share/back/DDMImpl.c
index d3dfccb..262f778 100644
--- a/src/share/back/DDMImpl.c
+++ b/src/share/back/DDMImpl.c
@@ -136,11 +136,6 @@
return JNI_TRUE;
}
-void DDM_initialize(void)
-{
- atomic_exchange(&ddmIsActive, gdata->ddmInitiallyActive);
-}
-
void DDM_onDisconnect(void)
{
jboolean was_active = atomic_exchange(&ddmIsActive, JNI_FALSE);
diff --git a/src/share/back/DDMImpl.h b/src/share/back/DDMImpl.h
index 4bebc65..b723c39 100644
--- a/src/share/back/DDMImpl.h
+++ b/src/share/back/DDMImpl.h
@@ -25,5 +25,4 @@
extern void *DDM_Cmds[];
-void DDM_initialize(void);
void DDM_onDisconnect(void);
diff --git a/src/share/back/debugInit.c b/src/share/back/debugInit.c
index a11a9bc..bd45fdc 100644
--- a/src/share/back/debugInit.c
+++ b/src/share/back/debugInit.c
@@ -39,9 +39,8 @@
#include "invoker.h"
#include "sys.h"
-// ANDROID-CHANGED: Allow us to initialize VMDebug & ddms apis.
+// ANDROID-CHANGED: Allow us to initialize VMDebug apis.
#include "vmDebug.h"
-#include "DDMImpl.h"
/* How the options get to OnLoad: */
#define XDEBUG "-Xdebug"
@@ -796,9 +795,6 @@
classTrack_initialize(env);
debugLoop_initialize();
- // ANDROID-CHANGED: Set up DDM
- DDM_initialize();
-
// ANDROID-CHANGED: Take over relevant VMDebug APIs.
vmDebug_initalize(env);
@@ -1109,8 +1105,6 @@
gdata->assertOn = DEFAULT_ASSERT_ON;
gdata->assertFatal = DEFAULT_ASSERT_FATAL;
logfile = DEFAULT_LOGFILE;
- // ANDROID-CHANGED: By default we assume ddms is off initially.
- gdata->ddmInitiallyActive = JNI_FALSE;
/* Options being NULL will end up being an error. */
if (options == NULL) {
@@ -1312,11 +1306,6 @@
if ( !get_boolean(&str, &useStandardAlloc) ) {
goto syntax_error;
}
- // ANDROID-CHANGED: Need to be able to tell if ddm is initially running.
- } else if ( strcmp(buf, "ddm_already_active")==0 ) {
- if ( !get_boolean(&str, &(gdata->ddmInitiallyActive)) ) {
- goto syntax_error;
- }
} else {
goto syntax_error;
}
diff --git a/src/share/back/util.h b/src/share/back/util.h
index 020247a..68174fd 100644
--- a/src/share/back/util.h
+++ b/src/share/back/util.h
@@ -148,9 +148,6 @@
/* ANDROID-CHANGED: com.android.art.internal.ddm.process_chunk extension function */
DdmProcessChunk ddm_process_chunk;
- /* ANDROID-CHANGED: Need to keep track of if ddm is initially active. */
- jboolean ddmInitiallyActive;
-
} BackendGlobalData;
extern BackendGlobalData * gdata;