merge intel x86 patches into gingerbread branch

This commit is contained in:
David 'Digit' Turner
2011-07-08 18:19:01 +02:00
3 changed files with 3 additions and 3 deletions

View File

@@ -253,4 +253,4 @@ float SC_turbulencef3(float x, float y, float z, float octaves)
}
}
}
}

View File

@@ -181,4 +181,3 @@ JNIEXPORT void JNICALL Java_com_android_gljni_GLJNILib_changeBackground(JNIEnv *
{
background = 1.0f - background;
}

View File

@@ -97,10 +97,11 @@ final class NativeDaemonConnector implements Runnable {
LocalSocketAddress.Namespace.RESERVED);
socket.connect(address);
mOutputStream = socket.getOutputStream();
mCallbacks.onDaemonConnected();
InputStream inputStream = socket.getInputStream();
mOutputStream = socket.getOutputStream();
byte[] buffer = new byte[BUFFER_SIZE];
int start = 0;