Add Gradle build. This time, we don't remove the old build system and we don't switch Travis.

Author: hrydgard

.gitignore

@@ -47,20 +47,18 @@ PPSSPPControls.dat
 # Qt Linguist files
 *.qm
 
-#Android stuff
+# Gradle/Android Studio
+.gradle
 .idea
-android/.idea
+*.iml
+build
+build.ios
 
 Logs
 Memstick
 memstick
 Cheats
 
-bin
-gen
-libs
-obj
-build*/
 /git-version.cpp
 
 .pspsh.hist

.travis.sh

@@ -119,6 +119,10 @@ travis_script() {
         pushd android
         ./ab.sh -j2 APP_ABI=$APP_ABI
         popd
+
+#        When we can get this to work...
+#        chmod +x gradlew
+#        ./gradlew assembleRelease
     fi
     if [ "$PPSSPP_BUILD_TYPE" = "iOS" ]; then
         ./b.sh --ios

CMakeLists.txt

@@ -9,7 +9,6 @@ project(PPSSPP)
 enable_language(ASM)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
-add_definitions(-DPPSSPP)
 add_definitions(-D__STDC_CONSTANT_MACROS)
 
 # Of the CMake platforms, we only support Vulkan on Android and Windows.
@@ -50,8 +49,10 @@ include(ccache)
 # Remove soon?
 set(USE_FFMPEG ON)
 
-if(ARM OR SIMULATOR)
-	set(USING_EGL ON)
+if(NOT ANDROID)
+	if(ARM OR SIMULATOR)
+		set(USING_EGL ON)
+	endif()
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -168,21 +169,23 @@ if(X86_64)
 	message("Generating for x86_64, ${CMAKE_BUILD_TYPE}")
 endif()
 if(ARM64)
-  message("Generating for ARMv8, ${CMAKE_BUILD_TYPE}")
+	message("Generating for ARMv8, ${CMAKE_BUILD_TYPE}")
 endif()
-
+message("hello")
 if(NOT MSVC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-  if (NOT ANDROID)
-    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
-    set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
-    set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
-    set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
-  endif()
+	if (NOT ANDROID)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
+		set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
+		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
+		set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
+		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
+		set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
+	else()
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -Wno-switch -Wno-uninitialized")
+	endif()
 	#TODO: Remove this and include the file properly everywhere it makes sense
 	# First step is too use the macros everywhere
 	# Second step is to remove the compatibility defines
@@ -192,6 +195,7 @@ if(NOT MSVC)
 
 	# Disable some warnings
 	add_definitions(-Wno-multichar)
+	add_definitions(-Wno-deprecated-register)
 
 	# Don't compile with strict aliasing, we're not 100% aliasing-safe
 	add_definitions(-fno-strict-aliasing)
@@ -206,17 +210,19 @@ if(NOT MSVC)
 
 	if(IOS)
 	elseif(APPLE AND NOT CMAKE_CROSSCOMPILING)
-        # We want C++11, so target 10.7+
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
+		# We want C++11, so target 10.7+
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -stdlib=libc++ -U__STRICT_ANSI__")
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
-	else()
+	elseif(NOT ANDROID)
 		if (NOT CMAKE_C_COMPILER_ID STREQUAL "Intel" AND NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")
 			add_definitions(-Wno-psabi)
 		endif()
 		add_definitions(-D_XOPEN_SOURCE=700)
 		add_definitions(-D_XOPEN_SOURCE_EXTENDED -D__BSD_VISIBLE=1)
 		add_definitions(-D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64)
+	elseif(ANDROID)
+		add_definitions(-fsigned-char)
 	endif()
 else()
 	# Disable warnings about MS-specific _s variants of libc functions
@@ -228,8 +234,10 @@ else()
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG")
 endif()
 
+if(NOT ANDROID)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
+endif()
 
 # This sets up the MSVC project dirs according to the physical project dirs
 macro(setup_target_project TargetName ProjectDir)
@@ -287,7 +295,7 @@ if(NOT (X86 OR ARM OR MIPS))
 	set(CommonFake
 		Common/FakeCPUDetect.cpp
 		Common/FakeEmitter.h)
-    source_group(Fake FILES ${CommonFake})
+	source_group(Fake FILES ${CommonFake})
 endif()
 
 set(CommonWindows
@@ -395,12 +403,12 @@ if(USE_FFMPEG)
       if(ANDROID)
         if(ARMV7)
           set(PLATFORM_ARCH "android/armv7")
-        elseif(ARM)
-          set(PLATFORM_ARCH "android/arm")
+        elseif(ARM64)
+          set(PLATFORM_ARCH "android/arm64")
+        elseif(X86_64)
+          set(PLATFORM_ARCH "android/x86_64")
         elseif(X86)
           set(PLATFORM_ARCH "android/x86")
-        else()
-          set(PLATFORM_ARCH "android/x86_64")
         endif()
       elseif(IOS)
         set(PLATFORM_ARCH "ios/universal")
@@ -417,7 +425,7 @@ if(USE_FFMPEG)
           set(PLATFORM_ARCH "linux/mips32")
         elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
           set(PLATFORM_ARCH "linux/x86_64")
-        else()
+        elseif(X86)
           set(PLATFORM_ARCH "linux/x86")
         endif()
       elseif(WIN32)
@@ -439,7 +447,7 @@ if(USE_FFMPEG)
 endif(USE_FFMPEG)
 
 find_package(ZLIB)
-if(ZLIB_FOUND)
+if(ZLIB_FOUND AND NOT ANDROID)
 	include_directories(${ZLIB_INCLUDE_DIR})
 	add_definitions(-DSHARED_ZLIB)
 else()
@@ -1569,6 +1577,8 @@ if(ANDROID)
     set(CoreExtraLibs -Wl,--gc-sections -Wl,--exclude-libs,ALL)
   endif()
 endif()	
+ 
+set(CoreExtraLibs ${CoreExtraLibs} armips)
 
 set(GlslangLibs glslang OGLCompiler OSDependent SPIRV SPVRemapper)
 
@@ -1773,9 +1783,10 @@ if (TargetBin)
 endif()
 
 # installs
+if(NOT ANDROID)
 file(INSTALL ${NativeAssets} DESTINATION assets)
 file(INSTALL flash0 DESTINATION assets)
-
+endif()
 # packaging and code signing
 if(IOS)
 	file(GLOB IOSAssets ios/assets/*.png)

Common/MipsCPUDetect.cpp

@@ -158,7 +158,7 @@ void CPUInfo::Detect()
 {
 	// Set some defaults here
 	HTT = false;
-#ifdef PPSSPP_ARCH(MIPS64)
+#if PPSSPP_ARCH(MIPS64)
 	OS64bit = true;
 	CPU64bit = true;
 	Mode64bit = true;

Core/MIPS/MIPSAsm.cpp

@@ -8,6 +8,12 @@
 #include "Common/CommonTypes.h"
 
 #if defined(_WIN32) || defined(__ANDROID__)
+// Temporarily turned off on Android
+#define USE_ARMIPS
+#endif
+
+
+#ifdef USE_ARMIPS
 // This has to be before basictypes to avoid a define conflict.
 #include "ext/armips/Core/Assembler.h"
 #endif
@@ -27,7 +33,7 @@ std::wstring GetAssembleError()
 	return errorText;
 }
 
-#if defined(_WIN32) || defined(__ANDROID__)
+#ifdef USE_ARMIPS
 class PspAssemblerFile: public AssemblerFile
 {
 public:
@@ -38,8 +44,7 @@ class PspAssemblerFile: public AssemblerFile
 	bool open(bool onlyCheck) override{ return true; };
 	void close() override { };
 	bool isOpen() override { return true; };
-	bool write(void* data, size_t length) override
-	{
+	bool write(void* data, size_t length) override {
 		if (!Memory::IsValidAddress((u32)(address+length-1)))
 			return false;
 
@@ -55,8 +60,7 @@ class PspAssemblerFile: public AssemblerFile
 	int64_t getVirtualAddress() override { return address; };
 	int64_t getPhysicalAddress() override { return getVirtualAddress(); };
 	int64_t getHeaderSize() override { return 0; }
-	bool seekVirtual(int64_t virtualAddress) override
-	{
+	bool seekVirtual(int64_t virtualAddress) override {
 		if (!Memory::IsValidAddress(virtualAddress))
 			return false;
 		address = virtualAddress;
@@ -72,7 +76,7 @@ class PspAssemblerFile: public AssemblerFile
 
 bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address)
 {
-#if defined(_WIN32) || defined(__ANDROID__)
+#ifdef USE_ARMIPS
 	PspAssemblerFile file;
 	StringList errors;
 
@@ -108,4 +112,4 @@ bool MipsAssembleOpcode(const char* line, DebugInterface* cpu, u32 address)
 #endif
 }
 
-}
+}  // namespace

android/.gitignore

@@ -1,5 +1,11 @@
+bin
 gen
+libs
 obj
+build*/
+gen
+obj
+.externalNativeBuild
 android.iml
 #ui_atlas.zim
 ui_atlas.zim.png

android/build.gradle

@@ -0,0 +1,87 @@
+apply plugin: 'com.android.application'
+
+android {
+	signingConfigs {
+		config {
+		}
+	}
+	compileSdkVersion 25
+	buildToolsVersion '25.0.0'
+	defaultConfig {
+		applicationId 'org.ppsspp.ppsspp'
+		minSdkVersion 9
+		targetSdkVersion 25
+		ndk {
+			abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
+		}
+		signingConfig signingConfigs.config
+	}
+	buildTypes {
+		release {
+			minifyEnabled = false
+			signingConfig signingConfigs.config
+		}
+		debug {
+			minifyEnabled = false
+			jniDebuggable true
+		}
+	}
+	externalNativeBuild {
+		cmake {
+			path '../CMakeLists.txt'
+		}
+	}
+	sourceSets {
+		main {
+			manifest.srcFile 'AndroidManifest.xml'
+			res.srcDirs = ['res']
+			java.srcDirs = ['src']
+			aidl.srcDirs = ['src']
+			resources.srcDirs = ['src']
+			assets.srcDirs = [
+					'assets',
+			]
+			jni.srcDirs = ['..']
+		}
+
+	}
+	productFlavors {
+		normal {
+			applicationId 'org.ppsspp.ppsspp'
+			signingConfig signingConfigs.config
+			externalNativeBuild {
+				cmake {
+					// Available arguments listed at https://developer.android.com/ndk/guides/cmake.html
+					arguments '-DANDROID=true',
+							'-DANDROID_PLATFORM=android-15',
+							'-DANDROID_TOOLCHAIN=clang',
+							'-DANDROID_CPP_FEATURES=',
+							'-DANDROID_STL=gnustl_static',
+							'-DANDROID_ARM_NEON=TRUE'
+				}
+			}
+		}
+		gold {
+			applicationId 'org.ppsspp.ppssppgold'
+			signingConfig signingConfigs.config
+			externalNativeBuild {
+				cmake {
+					// Available arguments listed at https://developer.android.com/ndk/guides/cmake.html
+					arguments '-DANDROID=true',
+							'-DANDROID_PLATFORM=android-15',
+							'-DANDROID_TOOLCHAIN=clang',
+							'-DANDROID_CPP_FEATURES=',
+							'-DANDROID_STL=gnustl_static',
+							'-DANDROID_ARM_NEON=TRUE',
+							'-DGOLD=TRUE'
+				}
+			}
+		}
+	}
+}
+afterEvaluate {
+	android.sourceSets.main.assets.getSrcDirs().each { println it }
+}
+dependencies {
+	compile project(':com.bda.controller')
+}

android/project.properties

@@ -7,8 +7,6 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 #
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
 target=android-25

build.gradle

@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+       jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.0'
+    }
+}
+
+allprojects {
+    repositories {
+        jcenter()
+    }
+}

com.bda.controller/build.gradle

@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('com.bda.controller.jar'))