Skip to content
This repository was archived by the owner on Mar 2, 2018. It is now read-only.

Fixed TangoInitializationHelper.java for API 24+ #106

Open
sjfricke wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed TangoInitializationHelper.java for API 24+ #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8f268a
Fixed TangoInitializationHelper.java for API 24+
Jun 4, 2017
ec00a30
Removed unused x86 makefile cases
Jun 18, 2017
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
28 changes: 5 additions & 23 deletions ..._util/app/src/main/java/com/projecttango/examples/cpp/util/TangoInitializationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ public class TangoInitializationHelper {
public static final int ARCH_DEFAULT = 0;
public static final int ARCH_ARM64 = 1;
public static final int ARCH_ARM32 = 2;
public static final int ARCH_X86_64 = 3;
public static final int ARCH_X86 = 4;

/**
* Only for apps using the C API:
Expand Down Expand Up @@ -81,51 +79,35 @@ public static final int loadTangoSharedLibrary() {
if (!(new File(basePath).exists())) {
basePath = "/data/data/com.projecttango.tango/libfiles/";
}
Log.i("TangoInitializationHelper", "basePath: " + basePath);
Log.i("TangoInitializationHelp", "basePath: " + basePath);

try {
System.load(basePath + "arm64-v8a/libtango_client_api.so");
loadedSoId = ARCH_ARM64;
Log.i("TangoInitializationHelper", "Success! Using arm64-v8a/libtango_client_api.");
Log.i("TangoInitializationHelp", "Success! Using arm64-v8a/libtango_client_api.");
} catch (UnsatisfiedLinkError e) {
}
if (loadedSoId < ARCH_DEFAULT) {
try {
System.load(basePath + "armeabi-v7a/libtango_client_api.so");
loadedSoId = ARCH_ARM32;
Log.i("TangoInitializationHelper", "Success! Using armeabi-v7a/libtango_client_api.");
} catch (UnsatisfiedLinkError e) {
}
}
if (loadedSoId < ARCH_DEFAULT) {
try {
System.load(basePath + "x86_64/libtango_client_api.so");
loadedSoId = ARCH_X86_64;
Log.i("TangoInitializationHelper", "Success! Using x86_64/libtango_client_api.");
} catch (UnsatisfiedLinkError e) {
}
}
if (loadedSoId < ARCH_DEFAULT) {
try {
System.load(basePath + "x86/libtango_client_api.so");
loadedSoId = ARCH_X86;
Log.i("TangoInitializationHelper", "Success! Using x86/libtango_client_api.");
Log.i("TangoInitializationHelp", "Success! Using armeabi-v7a/libtango_client_api.");
} catch (UnsatisfiedLinkError e) {
}
}
if (loadedSoId < ARCH_DEFAULT) {
try {
System.load(basePath + "default/libtango_client_api.so");
loadedSoId = ARCH_DEFAULT;
Log.i("TangoInitializationHelper", "Success! Using default/libtango_client_api.");
Log.i("TangoInitializationHelp", "Success! Using default/libtango_client_api.");
} catch (UnsatisfiedLinkError e) {
}
}
if (loadedSoId < ARCH_DEFAULT) {
try {
System.loadLibrary("tango_client_api");
loadedSoId = ARCH_FALLBACK;
Log.i("TangoInitializationHelper", "Falling back to libtango_client_api.so symlink.");
Log.i("TangoInitializationHelp", "Falling back to libtango_client_api.so symlink.");
} catch (UnsatisfiedLinkError e) {
}
}
Expand Down
4 changes: 0 additions & 4 deletions tango_3d_reconstruction/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := tango_3d_reconstruction
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include

ifeq ($(TARGET_ARCH), x86)
LOCAL_SRC_FILES := lib/x86/libtango_3d_reconstruction.so
endif

ifeq ($(TARGET_ARCH), arm64)
LOCAL_SRC_FILES := lib/arm64-v8a/libtango_3d_reconstruction.so
endif
Expand Down
5 changes: 0 additions & 5 deletions tango_client_api/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,6 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := tango_client_api


ifeq ($(TARGET_ARCH), x86)
LOCAL_EXPORT_LDLIBS := -L$(LOCAL_PATH)/lib/x86 -ltango_client_api
endif

ifeq ($(TARGET_ARCH), arm64)
LOCAL_EXPORT_LDLIBS := -L$(LOCAL_PATH)/lib/arm64-v8a -ltango_client_api
endif
Expand Down
4 changes: 0 additions & 4 deletions tango_support_api/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := tango_support_api
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include

ifeq ($(TARGET_ARCH), x86)
LOCAL_SRC_FILES := lib/x86/libtango_support_api.so
endif

ifeq ($(TARGET_ARCH), arm64)
LOCAL_SRC_FILES := lib/arm64-v8a/libtango_support_api.so
endif
Expand Down