From b6e9a47974fbb4c40e4b640e42036ca2f44ad73d Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Sun, 19 Jul 2015 17:33:38 +0200
Subject: [PATCH] Remove separate OpenSL .so, update native accordingly. Fix
 connection error reporting in HomebrewStore

---
 Core/FileLoaders/HTTPFileLoader.cpp |  1 +
 UI/Store.cpp                        |  3 +++
 android/jni/Android.mk              | 20 --------------------
 android/jni/Locals.mk               |  2 +-
 native                              |  2 +-
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/Core/FileLoaders/HTTPFileLoader.cpp b/Core/FileLoaders/HTTPFileLoader.cpp
index 362bf2cf00..8cc8b9e104 100644
--- a/Core/FileLoaders/HTTPFileLoader.cpp
+++ b/Core/FileLoaders/HTTPFileLoader.cpp
@@ -23,6 +23,7 @@
 HTTPFileLoader::HTTPFileLoader(const std::string &filename)
 	: filesize_(0), filepos_(0), url_(filename), filename_(filename), connected_(false) {
 	if (!client_.Resolve(url_.Host().c_str(), url_.Port())) {
+		// TODO: Should probably set some flag?
 		return;
 	}
 
diff --git a/UI/Store.cpp b/UI/Store.cpp
index a4b3f1a0ad..b0d6519a1e 100644
--- a/UI/Store.cpp
+++ b/UI/Store.cpp
@@ -320,12 +320,15 @@ void StoreScreen::update(InputState &input) {
 			listing_->buffer().TakeAll(&listingJson);
 			// printf("%s\n", listingJson.c_str());
 			loading_ = false;
+			connectionError_ = false;
 
 			ParseListing(listingJson);
 			RecreateViews();
 		} else {
 			// Failed to contact store. Don't do anything.
+			ELOG("Download failed : error code %d", listing_->ResultCode());
 			connectionError_ = true;
+			loading_ = false;
 			RecreateViews();
 		}
 
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 8f60163030..937eebf1df 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -1,25 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 
-# BEGIN Native Audio Separate Library - copy paste this section to your Android.mk
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := native_audio
-LOCAL_CFLAGS := -O3 -fsigned-char -Wall -Wno-multichar -Wno-psabi -D__STDC_CONSTANT_MACROS
-# yes, it's really CPPFLAGS for C++
-LOCAL_CPPFLAGS := -fno-exceptions -std=gnu++11 -fno-rtti
-NATIVE := ../../native
-LOCAL_SRC_FILES := \
-		$(NATIVE)/android/native-audio-so.cpp
-LOCAL_C_INCLUDES := \
-		$(LOCAL_PATH)/$(NATIVE) \
-		$(LOCAL_PATH)
-LOCAL_LDLIBS := -lOpenSLES -llog
-		
-include $(BUILD_SHARED_LIBRARY)
-
-# END Native Audio Separate Library - copy paste this section to your Android.mk
-
 include $(CLEAR_VARS)
 
 #TARGET_PLATFORM := android-8
diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk
index f8a940f305..359f5aa710 100644
--- a/android/jni/Locals.mk
+++ b/android/jni/Locals.mk
@@ -15,7 +15,7 @@ LOCAL_C_INCLUDES := \
   $(LOCAL_PATH)
 
 LOCAL_STATIC_LIBRARIES := native libzip
-LOCAL_LDLIBS := -lz -lGLESv2 -lEGL -ldl -llog
+LOCAL_LDLIBS := -lz -lGLESv2 -lOpenSLES -lEGL -ldl -llog
 
 # ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
diff --git a/native b/native
index ad5301873f..166d07df0c 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit ad5301873f7db44eb4b13bc7592ffe511928325a
+Subproject commit 166d07df0c37c038a02bda687ba77a5bbfd1d01c