diff --git a/Makefile b/Makefile index df050505f..4b2cec29c 100644 --- a/Makefile +++ b/Makefile @@ -128,7 +128,7 @@ update-project: $(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET) liblinphone_tester: prepare-sources prepare-cunit prepare-liblinphone_tester - $(NDK_PATH)/ndk-build -C liblinphone_tester NDK_DEBUG=1 $(LIBLINPHONE_OPTIONS) -j$(NUMCPUS) + $(NDK_PATH)/ndk-build -C liblinphone_tester $(LIBLINPHONE_OPTIONS) NDK_DEBUG=1 -j$(NUMCPUS) generate-apk: ant partial-clean diff --git a/liblinphone_tester/AndroidManifest.xml b/liblinphone_tester/AndroidManifest.xml index 91848ce78..22cda42aa 100644 --- a/liblinphone_tester/AndroidManifest.xml +++ b/liblinphone_tester/AndroidManifest.xml @@ -9,6 +9,7 @@ android:targetSdkVersion="17" /> + diff --git a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java index 0a8e6120d..af5c75427 100644 --- a/liblinphone_tester/src/org/linphone/tester/LogsActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/LogsActivity.java @@ -37,6 +37,17 @@ public class LogsActivity extends Activity { } } + private static String join(String [] array, String separator) { + String ret = ""; + for(int i = 0; i < array.length; ++i) { + if(i != 0) { + ret += separator; + } + ret += array[i]; + } + return ret; + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -47,6 +58,7 @@ public class LogsActivity extends Activity { String[] values = extras.getStringArray("args"); if(values != null) { if(mLogsThread == null || !mLogsThread.isAlive()) { + this.setTitle("Test Logs (" + join(values, " ") + ")"); mLogs = ""; ((TextView)findViewById(R.id.textView1)).setText(mLogs); mLogsThread = new LogsThread(this, values); diff --git a/liblinphone_tester/src/org/linphone/tester/MainActivity.java b/liblinphone_tester/src/org/linphone/tester/MainActivity.java index baa576783..da1aa5bc8 100644 --- a/liblinphone_tester/src/org/linphone/tester/MainActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/MainActivity.java @@ -13,7 +13,6 @@ import android.view.Menu; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; -import android.widget.LinearLayout.LayoutParams; public class MainActivity extends Activity { diff --git a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java index 975d85813..ffaa91bd7 100644 --- a/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/SuitesActivity.java @@ -19,6 +19,7 @@ public class SuitesActivity extends Activity { if (extras != null) { mSuite = extras.getString("suite"); if(mSuite != null) { + this.setTitle(this.getResources().getString(R.string.app_name) + " | " + mSuite); TesterList suitesTest = new TesterList(); suitesTest.run(new String[]{"tester", "--list-tests", mSuite}); LinearLayout layout = ((LinearLayout)findViewById(R.id.tests_list)); diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java index a8e317419..5a2941e6a 100644 --- a/liblinphone_tester/src/org/linphone/tester/Tester.java +++ b/liblinphone_tester/src/org/linphone/tester/Tester.java @@ -28,7 +28,7 @@ public class Tester { return System.getProperty("os.arch").contains("armv7"); } - static { + static { // FFMPEG (audio/video) loadOptionalLibrary("avutil"); loadOptionalLibrary("swscale");