add ui

app/build.gradle

@@ -22,7 +22,10 @@ android {
 
     buildTypes {
         release {
-            signingConfig signingConfigs.debug
+            minifyEnabled = true
+            shrinkResources = true
+            signingConfig = signingConfigs.debug
+            proguardFiles("proguard-rules.pro")
         }
     }
 
@@ -67,7 +70,7 @@ android {
 }
 
 dependencies {
-//    implementation 'io.github.vvb2060.ndk:boringssl:4.0'
+    implementation 'io.github.vvb2060.ndk:boringssl:4.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test:rules:1.5.0'
 }

app/proguard-rules.pro

@@ -0,0 +1,2 @@
+-repackageclasses
+-allowaccessmodification

app/src/main/AndroidManifest.xml

@@ -7,5 +7,18 @@
     <application
         android:label="BoringSSL"
         android:theme="@android:style/Theme.DeviceDefault"
-        tools:ignore="AllowBackup,MissingApplicationIcon" />
+        tools:ignore="AllowBackup,MissingApplicationIcon">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
 </manifest>

app/src/main/java/io/github/vvb2060/ndk/boringssl/test/MainActivity.java

@@ -0,0 +1,195 @@
+package io.github.vvb2060.ndk.boringssl.test;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Process;
+import android.text.InputType;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.zip.ZipFile;
+
+public class MainActivity extends Activity {
+    private final ExecutorService executor = Executors.newSingleThreadExecutor();
+    private String apkPath;
+    private ScrollView scrollView;
+    private TextView textView;
+    private EditText editText;
+    private Future<?> future;
+
+    @SuppressWarnings("SameParameterValue")
+    private int dp2px(float dp) {
+        float density = getResources().getDisplayMetrics().density;
+        return (int) (dp * density + 0.5f);
+    }
+
+    private View buildView() {
+        var rootView = new LinearLayout(this);
+        rootView.setOrientation(LinearLayout.VERTICAL);
+        rootView.setFitsSystemWindows(true);
+
+        editText = new EditText(this);
+        var editParams = new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+        editText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE);
+        editText.setHorizontallyScrolling(false);
+        editText.setOnEditorActionListener((v, actionId, event) -> {
+            if (event == null) return false;
+            if (event.getAction() == KeyEvent.ACTION_DOWN &&
+                    event.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+                var text = v.getText().toString();
+                if (text.isEmpty()) {
+                    textView.setText("bssl crypto_test ssl_test");
+                    return true;
+                }
+                textView.setText("");
+                future = executor.submit(() -> {
+                    var st = new StringTokenizer(text);
+                    var cmd = new LinkedList<String>();
+                    while (st.hasMoreTokens()) {
+                        cmd.add(st.nextToken());
+                    }
+                    exec(cmd);
+                });
+                return true;
+            }
+            return false;
+        });
+        editText.setOnFocusChangeListener((v, hasFocus) -> {
+            if (hasFocus && future != null) {
+                future.cancel(true);
+            }
+        });
+        rootView.addView(editText, editParams);
+
+        scrollView = new ScrollView(this);
+        var scrollParams = new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 1);
+        rootView.addView(scrollView, scrollParams);
+
+        textView = new TextView(this);
+        var textParams = new ScrollView.LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
+        var dp8 = dp2px(8);
+        textView.setPadding(dp8, dp8, dp8, dp8);
+        textView.setTypeface(Typeface.create(Typeface.MONOSPACE, Typeface.NORMAL));
+        textView.setTextIsSelectable(true);
+        textView.requestFocus();
+        scrollView.addView(textView, textParams);
+
+        return rootView;
+    }
+
+    private void append(String string) {
+        scrollView.post(() -> {
+            textView.append(string);
+            textView.append("\n");
+            scrollView.fullScroll(ScrollView.FOCUS_DOWN);
+        });
+    }
+
+    private void startProcess(List<String> command) throws Exception {
+        var process = new ProcessBuilder(command).redirectErrorStream(true).start();
+        var reader = new InputStreamReader(process.getInputStream());
+        try (var br = new BufferedReader(reader)) {
+            String line = br.readLine();
+            while (line != null) {
+                append(line);
+                if (Thread.interrupted()) {
+                    process.destroy();
+                    append("[ kill ]");
+                    break;
+                }
+                line = br.readLine();
+            }
+        }
+        append("[ exit " + process.waitFor() + " ]");
+    }
+
+    @TargetApi(Build.VERSION_CODES.Q)
+    private void execLinker(List<String> command) {
+        var is64Bit = Process.is64Bit();
+        var abi = is64Bit ? Build.SUPPORTED_64_BIT_ABIS[0] : Build.SUPPORTED_32_BIT_ABIS[0];
+        var path = apkPath + "!/lib/" + abi + "/lib" + command.get(0) + ".so";
+        try {
+            append("[ exec " + path + " ]");
+            command.set(0, path);
+            command.add(0, is64Bit ? "linker64" : "linker");
+            startProcess(command);
+        } catch (Exception e) {
+            append(Log.getStackTraceString(e));
+        }
+    }
+
+    private boolean copyFile(File file) {
+        if (file.canExecute()) return true;
+        try (var apk = new ZipFile(apkPath)) {
+            var so = apk.getEntry("lib/" + Build.SUPPORTED_ABIS[0] + "/lib" + file + ".so");
+            assert so != null;
+            try (var in = apk.getInputStream(so); var out = new FileOutputStream(file)) {
+                var buffer = new byte[8192];
+                for (var n = in.read(buffer); n >= 0; n = in.read(buffer))
+                    out.write(buffer, 0, n);
+            }
+            return file.setExecutable(true);
+        } catch (IOException e) {
+            append(Log.getStackTraceString(e));
+            return false;
+        }
+    }
+
+    private void execFile(List<String> command) {
+        var file = new File(getCodeCacheDir(), command.get(0));
+        if (!copyFile(file)) return;
+        try {
+            append("[ exec " + file + " ]");
+            command.set(0, file.toString());
+            startProcess(command);
+        } catch (Exception e) {
+            append(Log.getStackTraceString(e));
+        }
+    }
+
+    private void exec(List<String> command) {
+        if (command.isEmpty()) return;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            execLinker(command);
+        } else {
+            execFile(command);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(buildView());
+        apkPath = getApplicationInfo().sourceDir;
+        editText.setText("bssl");
+        editText.dispatchKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ENTER));
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        executor.shutdownNow();
+    }
+}

boringssl/src/main/native/Android.mk

@@ -19,12 +19,12 @@ LOCAL_LDFLAGS           := -fPIE
 include $(LOCAL_PATH)/build-executable.mk
 
 include $(CLEAR_VARS)
-LOCAL_MODULE            := tool
+LOCAL_MODULE            := bssl
 LOCAL_STATIC_LIBRARIES  := crypto_static ssl_static
 LOCAL_SRC_FILES         := $(tool_sources)
 LOCAL_LDFLAGS           := -fPIE
 include $(LOCAL_PATH)/build-executable.mk
 
-include $(LOCAL_PATH)/BoringSSL.mk
+#include $(LOCAL_PATH)/BoringSSL.mk
 $(call import-module,third_party/googletest)
-#$(call import-module,prefab/boringssl)
+$(call import-module,prefab/boringssl)