Cleanup

Author: tranleduy2000

app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
     <uses-permission android:name="com.android.vending.BILLING" />
 
     <application
-        android:name="com.jecelyin.editor.v2.TextEditorApplication"
+        android:name="com.duy.editor.TextEditorApplication"
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
@@ -94,9 +94,6 @@
             android:name="com.pdaxrom.utils.FileDialog"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:label="@string/filebrowser_name" />
-        <activity
-            android:name="com.pdaxrom.cctools.CCtoolsPreferences"
-            android:label="@string/preferences" />
         <activity android:name="com.pdaxrom.cctools.LauncherNativeActivity">
             <intent-filter>
                 <action android:name="com.pdaXrom.cctools.action.RUN" />

app/src/main/java/com/duy/ccppcompiler/packagemanager/Environment.java

@@ -19,6 +19,7 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
 
 import com.pdaxrom.utils.Utils;
 
@@ -27,6 +28,7 @@
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;
+import java.io.FilenameFilter;
 import java.io.InputStreamReader;
 
 import jackpal.androidterm.TermSettings;
@@ -180,9 +182,9 @@ private static String getShareDir(Context context) {
     private static String getBootClassPath() {
         String bootClassPath = getEnv("BOOTCLASSPATH", null);
         if (bootClassPath == null) {
-            bootClassPath = Utils.getBootClassPath();
+            bootClassPath = findBootClassPath();
         }
-        if (bootClassPath == null) {
+        if (bootClassPath == null || bootClassPath.isEmpty()) {
             bootClassPath = "/system/framework/core.jar:" +
                     "/system/framework/ext.jar:" +
                     "/system/framework/framework.jar:" +
@@ -192,6 +194,29 @@ private static String getBootClassPath() {
         return bootClassPath;
     }
 
+    @Nullable
+    private static String findBootClassPath() {
+        String classPath = null;
+        File dir = new File("/system/framework");
+        if (dir.exists() && dir.isDirectory()) {
+            FilenameFilter filter = new FilenameFilter() {
+                public boolean accept(File dir, String name) {
+                    String lowercaseName = name.toLowerCase();
+                    return lowercaseName.endsWith(".jar");
+                }
+            };
+
+            String[] list = dir.list(filter);
+            for (int i = 0; i < list.length; i++) {
+                String file = list[i];
+                if (i != 0) {
+                    classPath += ":";
+                }
+                classPath += "/system/framework/" + file;
+            }
+        }
+        return classPath;
+    }
 
     private static String getEnv(String name, String defValue) {
         String value = System.getenv(name);

app/src/main/java/com/jecelyin/editor/v2/TextEditorApplication.java renamed to app/src/main/java/com/duy/editor/TextEditorApplication.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.jecelyin.editor.v2;
+package com.duy.editor;
 
 import android.content.Context;
 import android.support.multidex.MultiDexApplication;

app/src/main/java/com/pdaxrom/cctools/BuildActivity.java

@@ -83,7 +83,6 @@ public void onCreate(Bundle savedInstanceState) {
         String fileName = new File(mFilePath).getName();
         if (fileName.contentEquals("Makefile") || fileName.contentEquals("makefile")) {
             mCommand = "make " + systemShell;
-            mCommand += " " + CompilerSetting.getMakeFlags();
 
         } else {
             int dotPos = fileName.lastIndexOf(".");