From 8c091541830a1ca7929d57bd708431da1db230d6 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 8 Jun 2017 19:55:28 -0700
Subject: [PATCH] Build debug and release library variants

---
 moonlight-common/build.gradle                            | 9 ++++++---
 moonlight-common/src/main/jni/Application.mk             | 3 ---
 moonlight-common/src/main/jni/moonlight-core/Android.mk  | 6 +++++-
 .../src/main/jni/moonlight-core/moonlight-common-c       | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/moonlight-common/build.gradle b/moonlight-common/build.gradle
index 88cf039d..92af083f 100644
--- a/moonlight-common/build.gradle
+++ b/moonlight-common/build.gradle
@@ -1,12 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.0"
+
+    // Build release and debug libs
+    publishNonDefault true
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 25
+        targetSdkVersion 26
 
         ndk {
             abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
diff --git a/moonlight-common/src/main/jni/Application.mk b/moonlight-common/src/main/jni/Application.mk
index bbfdda00..3ed75151 100644
--- a/moonlight-common/src/main/jni/Application.mk
+++ b/moonlight-common/src/main/jni/Application.mk
@@ -5,6 +5,3 @@ APP_PLATFORM := android-16
 
 # Support all modern ABIs
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
-
-# We want an optimized build
-APP_OPTIM := release
diff --git a/moonlight-common/src/main/jni/moonlight-core/Android.mk b/moonlight-common/src/main/jni/moonlight-core/Android.mk
index 1c4041c3..1151b40a 100644
--- a/moonlight-common/src/main/jni/moonlight-core/Android.mk
+++ b/moonlight-common/src/main/jni/moonlight-core/Android.mk
@@ -43,7 +43,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/moonlight-common-c/enet/include \
                     $(LOCAL_PATH)/moonlight-common-c/reedsolomon \
                     $(LOCAL_PATH)/moonlight-common-c/src \
 
-LOCAL_CFLAGS := -DHAS_SOCKLEN_T=1 -DLC_ANDROID -DLC_DEBUG
+LOCAL_CFLAGS := -DHAS_SOCKLEN_T=1 -DLC_ANDROID
+
+ifeq ($(NDK_DEBUG),1)
+LOCAL_CFLAGS += -DLC_DEBUG
+endif
 
 LOCAL_LDLIBS := -llog
 
diff --git a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
index 63403183..c01deff6 160000
--- a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
+++ b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c
@@ -1 +1 @@
-Subproject commit 634031839ca4b2b122278c36c5fc604e770bebbb
+Subproject commit c01deff683d9192a71f851815dbea4bba14e4f04