Skip to content

Choose the best available ABI automatically #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 1, 2015
Merged

Choose the best available ABI automatically #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b5d6a0
Revert "properly manage creation of AVD"
omerjerk Jul 28, 2015
b7fd754
Revert "keep an abi selected initially"
omerjerk Jul 28, 2015
2ad0545
Revert "Make abi selectable while creating new AVD"
omerjerk Jul 28, 2015
c9aee98
automatically choose the best available abi for a particular API level
omerjerk Jul 28, 2015
30c8410
Show proper AVD creation error
omerjerk Jul 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
168 changes: 87 additions & 81 deletions src/processing/mode/android/AVD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package processing.mode.android;

import processing.app.Base;
//import processing.app.Preferences;
import processing.app.exec.ProcessHelper;
import processing.app.exec.ProcessResult;
import processing.core.PApplet;
Expand All @@ -17,7 +16,7 @@ public class AVD {
static private final String AVD_CREATE_SECONDARY =
"The default Android emulator could not be set up. Make sure<br>" +
"that the Android SDK is installed properly, and that the<br>" +
"Android and Google APIs are installed for level %s.<br>" +
"system images are installed for level %s.<br>" +
"(Between you and me, occasionally, this error is a red herring,<br>" +
"and your sketch may be launching shortly.)";

Expand All @@ -44,100 +43,62 @@ public class AVD {

/** "android-7" or "Google Inc.:Google APIs:7" */
protected String target;

/** x86, x86_64 or armeabi **/
protected String abi;

protected VirtualDevice virtualDevice;

public static final String PREF_KEY_ABI = "android.sdk.abi";
public static final String[] ABI = {"armeabi", "x86", "x86_64"};

/** Default virtual device used by Processing. */
static public AVD defaultAVD;
static public final AVD defaultAVD =
new AVD("Processing-0" + Base.getRevision(),
"android-" + AndroidBuild.sdkVersion);
// "Google Inc.:Google APIs:" + AndroidBuild.sdkVersion);

static ArrayList<VirtualDevice> avdList;
static ArrayList<VirtualDevice> badList;


private static class VirtualDevice {
public String name;
public String target;
public String abi;
public VirtualDevice(String name, String target, String abi) {
this.name = name;
this.target = target;
this.abi = abi;
}
static ArrayList<String> avdList;
static ArrayList<String> badList;
// static ArrayList<String> skinList;

@Override
public boolean equals(Object o) {
VirtualDevice device = (VirtualDevice) o;
if (device.name.equals(name) && device.target.equals(target)
&& device.abi.equals(abi)) {
return true;
}
return false;
}
}

private String[] preferredAbi = new String[50];
private static ArrayList<String> abiList = new ArrayList<>();

public AVD(String name, String target, String abi) {
public AVD(final String name, final String target) {
this.name = name;
this.target = target;
this.abi = abi;
virtualDevice = new VirtualDevice(name, target, abi);
}

private void initializeAbiList() {
if (abiList.size() == 0) {
abiList.add("armeabi");
abiList.add("x86");
abiList.add("x86_64");
}
}


static protected void list(final AndroidSDK sdk) throws IOException {
try {
avdList = new ArrayList<VirtualDevice>();
badList = new ArrayList<VirtualDevice>();
avdList = new ArrayList<String>();
badList = new ArrayList<String>();
ProcessResult listResult =
new ProcessHelper(sdk.getAndroidToolPath(), "list", "avds").execute();
if (listResult.succeeded()) {
boolean badness = false;
String mTarget = null;
String mAbi = null;
String mName = null;
for (String line : listResult) {
String[] m = PApplet.match(line, "\\s+Name\\:\\s+(\\S+)");
if (m != null) {
mName = m[1];
continue;
}

m = PApplet.match(line, "API\\slevel\\s([0-9]+)");
if (m != null) {
mTarget = m[1];
continue;
}

m = PApplet.match(line, "\\s+Tag\\/ABI\\:\\s\\S+\\/(\\S+)");
if (m != null) {
mAbi = m[1];
}

if (mName != null && mTarget != null && mAbi != null) {
VirtualDevice mVirtualDevice = new VirtualDevice(mName, mTarget, mAbi);
mTarget = null;
mAbi = null;
if (!badness) {
avdList.add(mVirtualDevice);
// System.out.println("good: " + m[1]);
avdList.add(m[1]);
} else {
badList.add(mVirtualDevice);
// System.out.println("bad: " + m[1]);
badList.add(m[1]);
}
// } else {
// System.out.println("nope: " + line);
}

// "The following Android Virtual Devices could not be loaded:"
if (line.contains("could not be loaded:")) {
// System.out.println("starting the bad list");
// System.err.println("Could not list AVDs:");
// System.err.println(listResult);
badness = true;
break;
// break;
}
}
} else {
Expand All @@ -152,9 +113,15 @@ protected boolean exists(final AndroidSDK sdk) throws IOException {
if (avdList == null) {
list(sdk);
}
virtualDevice.target = AndroidBuild.sdkVersion;
virtualDevice.abi = abi;
return avdList.contains(virtualDevice);
for (String avd : avdList) {
if (Base.DEBUG) {
System.out.println("AVD.exists() checking for " + name + " against " + avd);
}
if (avd.equals(name)) {
return true;
}
}
return false;
}


Expand All @@ -164,24 +131,69 @@ protected boolean exists(final AndroidSDK sdk) throws IOException {
* (Prestigious may also not be the right word.)
*/
protected boolean badness() {
return badList.contains(virtualDevice);
for (String avd : badList) {
if (avd.equals(name)) {
return true;
}
}
return false;
}


protected boolean create(final AndroidSDK sdk) throws IOException {

final String[] list_abi = {
sdk.getAndroidToolPath(),
"list", "targets"
};

ProcessHelper p = new ProcessHelper(list_abi);
try {
final ProcessResult abiListResult = p.execute();
String api = null;
String abi = null;
for (String line : abiListResult) {
String[] m = PApplet.match(line, "API\\slevel:\\s(\\S+)");
if (m != null) {
api = m[1];
}

m = PApplet.match(line, "Tag\\/ABIs\\s:\\sdefault\\/(\\S+)");
if (m != null) {
abi = m[1];

if (api != null && abi != null) {
int index = Integer.parseInt(api);
if (preferredAbi[index] == null) {
preferredAbi[index] = abi;
} else if (abiList.indexOf(preferredAbi[index]) < abiList.indexOf(abi)) {
preferredAbi[index] = abi;
}
api = null;
abi = null;
}
}
}
} catch (InterruptedException e) {}

if (preferredAbi[Integer.parseInt(AndroidBuild.sdkVersion)] == null) {
return false;
}

final String[] params = {
sdk.getAndroidToolPath(),
"create", "avd",
"-n", name,
"-t", target,
"-c", DEFAULT_SDCARD_SIZE,
"-s", DEFAULT_SKIN,
"--abi", abi
"--abi", preferredAbi[Integer.parseInt(AndroidBuild.sdkVersion)]
};

// Set the list to null so that exists() will check again
avdList = null;
final ProcessHelper p = new ProcessHelper(params);

p = new ProcessHelper(params);
try {
// Passes 'no' to "Do you wish to create a custom hardware profile [no]"
// System.out.println("CREATE AVD STARTING");
Expand All @@ -197,8 +209,7 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
} else {
// Just generally not working
// Base.showWarning("Android Error", AVD_CREATE_ERROR, null);
Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY, AVD_CREATE_SECONDARY, null);
System.out.println(createAvdResult);
// throw new IOException("Error creating the AVD");
}
Expand All @@ -209,11 +220,8 @@ protected boolean create(final AndroidSDK sdk) throws IOException {
}


static public boolean ensureProperAVD(final AndroidSDK sdk, final String abi) {
static public boolean ensureProperAVD(final AndroidSDK sdk) {
try {
defaultAVD = new AVD("Processing-0" + Base.getRevision() + "-" + AndroidBuild.sdkVersion +
"-" + abi,
"android-" + AndroidBuild.sdkVersion, abi);
if (defaultAVD.exists(sdk)) {
// System.out.println("the avd exists");
return true;
Expand All @@ -229,12 +237,10 @@ static public boolean ensureProperAVD(final AndroidSDK sdk, final String abi) {
return true;
}
} catch (final Exception e) {
e.printStackTrace();
// Base.showWarning("Android Error", AVD_CREATE_ERROR, e);
Base.showWarningTiered("Android Error", AVD_CREATE_PRIMARY,
String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
String.format(AVD_CREATE_SECONDARY, AndroidBuild.sdkVersion), null);
}
System.out.println("at bottom of ensure proper");
return false;
}
}
34 changes: 1 addition & 33 deletions src/processing/mode/android/AndroidEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.File;
Expand Down Expand Up @@ -248,38 +247,7 @@ public void run() {
}.start();

menu.add(sdkMenu);
menu.addSeparator();

final JMenu abiMenu = new JMenu("Select CPU/ABI");
boolean abiSelected = false;
for (int i = 0; i < AVD.ABI.length; ++i) {
JMenuItem menuItem = new JCheckBoxMenuItem(AVD.ABI[i]);
abiMenu.add(menuItem);
if (AVD.ABI[i].equals(Preferences.get(AVD.PREF_KEY_ABI))) {
menuItem.setSelected(true);
abiSelected = true;
}
}
if (!abiSelected) {
abiMenu.getItem(2).setSelected(true); //Select x86_64 as the default
Preferences.set(AVD.PREF_KEY_ABI, AVD.ABI[2]);
}

for (int i = 0; i < abiMenu.getItemCount(); ++i) {
final JMenuItem abiItem = abiMenu.getItem(i);
abiItem.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
for (int j = 0; j < abiMenu.getItemCount(); ++j) {
abiMenu.getItem(j).setSelected(false);
}
abiItem.setSelected(true);
Preferences.set(AVD.PREF_KEY_ABI, abiItem.getText());
}
});
}

menu.add(abiMenu);

menu.addSeparator();

item = new JMenuItem("Android SDK Manager");
Expand Down
6 changes: 1 addition & 5 deletions src/processing/mode/android/AndroidMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,7 @@ public void handleRunEmulator(Sketch sketch, RunnerListener listener) throws Ske
listener.statusNotice("Building Android project...");
build.build("debug");

String abi = Preferences.get(AVD.PREF_KEY_ABI);
if (abi.equals("")) {
abi = "x86_64";
}
boolean avd = AVD.ensureProperAVD(sdk, abi);
boolean avd = AVD.ensureProperAVD(sdk);
if (!avd) {
SketchException se =
new SketchException("Could not create a virtual device for the emulator.");
Expand Down