From 12faaca3e4a7287e7eafb1b9ad4f831ea40af6c8 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 5 Jul 2015 16:08:41 -0700
Subject: [PATCH] Build Android using a static library.

This makes headless and unittest build much faster, especially when all
three are building at the same time.
---
 android/jni/Android.mk | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index e1012c2b8f..8f60163030 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -329,10 +329,18 @@ EXEC_AND_LIB_FILES := \
   $(SRC)/Core/Util/PPGeDraw.cpp \
   $(SRC)/git-version.cpp
 
+LOCAL_MODULE := ppsspp_core
+LOCAL_SRC_FILES := $(EXEC_AND_LIB_FILES)
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+include $(LOCAL_PATH)/Locals.mk
+LOCAL_STATIC_LIBRARIES += ppsspp_core
+
 # These are the files just for ppsspp_jni
 LOCAL_MODULE := ppsspp_jni
 LOCAL_SRC_FILES := \
-  $(EXEC_AND_LIB_FILES) \
   $(SRC)/native/android/app-android.cpp \
   $(SRC)/UI/BackgroundAudio.cpp \
   $(SRC)/UI/DevScreens.cpp \
@@ -364,6 +372,7 @@ endif
 ifeq ($(HEADLESS),1)
   include $(CLEAR_VARS)
   include $(LOCAL_PATH)/Locals.mk
+  LOCAL_STATIC_LIBRARIES += ppsspp_core
 
   # Android 5.0 requires PIE for executables.  Only supported on 4.1+, but this is testing anyway.
   LOCAL_CFLAGS += -fPIE
@@ -371,7 +380,6 @@ ifeq ($(HEADLESS),1)
 
   LOCAL_MODULE := ppsspp_headless
   LOCAL_SRC_FILES := \
-    $(EXEC_AND_LIB_FILES) \
     $(SRC)/headless/Headless.cpp \
     $(SRC)/headless/Compare.cpp
 
@@ -381,6 +389,7 @@ endif
 ifeq ($(UNITTEST),1)
   include $(CLEAR_VARS)
   include $(LOCAL_PATH)/Locals.mk
+  LOCAL_STATIC_LIBRARIES += ppsspp_core
 
   # Android 5.0 requires PIE for executables.  Only supported on 4.1+, but this is testing anyway.
   LOCAL_CFLAGS += -fPIE
@@ -443,9 +452,8 @@ ifeq ($(UNITTEST),1)
 
   LOCAL_MODULE := ppsspp_unittest
   LOCAL_SRC_FILES := \
-	$(LIBARMIPS_FILES) \
-    $(EXEC_AND_LIB_FILES) \
-	$(SRC)/Core/MIPS/MIPSAsm.cpp \
+    $(LIBARMIPS_FILES) \
+    $(SRC)/Core/MIPS/MIPSAsm.cpp \
     $(SRC)/UnitTest/JitHarness.cpp \
     $(SRC)/UnitTest/TestVertexJit.cpp \
     $(TESTARMEMITTER_FILE) \