From bf5a046b823e738fb96069b3fb85f71368545816 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 18 Apr 2013 23:25:40 -0500 Subject: [PATCH] Update the ant files to build the APK from terminal --- Source/Android/custom_rules.xml | 7 +- Source/Android/jni/Android.mk | 189 ------------------------------ Source/Android/jni/Application.mk | 2 +- 3 files changed, 6 insertions(+), 192 deletions(-) diff --git a/Source/Android/custom_rules.xml b/Source/Android/custom_rules.xml index 3c6d5b53ba..e06de68e57 100644 --- a/Source/Android/custom_rules.xml +++ b/Source/Android/custom_rules.xml @@ -4,13 +4,16 @@ - + + + - diff --git a/Source/Android/jni/Android.mk b/Source/Android/jni/Android.mk index 68366e380c..e69de29bb2 100644 --- a/Source/Android/jni/Android.mk +++ b/Source/Android/jni/Android.mk @@ -1,189 +0,0 @@ -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 := -O2 -fsigned-char -ffast-math -Wall -Wno-multichar -Wno-psabi -std=gnu++0x -NATIVE := ../../native -LOCAL_SRC_FILES := \ - $(NATIVE)/android/native-audio-so.cpp -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 - -LOCAL_MODULE := ppsspp_jni - -NATIVE := ../../native -SRC := ../.. - -LOCAL_CFLAGS := -DUSE_PROFILER -DARM -DGL_GLEXT_PROTOTYPES -DUSING_GLES2 -O2 -fsigned-char -Wall -Wno-multichar -Wno-psabi -Wno-unused-variable -fno-strict-aliasing -ffast-math -LOCAL_CXXFLAGS := -std=gnu++0x -LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/../../Common \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/$(NATIVE)/base \ - $(LOCAL_PATH)/$(NATIVE)/ext/libzip \ - $(LOCAL_PATH)/$(NATIVE) \ - $(LOCAL_PATH) \ - -LOCAL_STATIC_LIBRARIES := native libzip -LOCAL_LDLIBS := -lz -lGLESv2 -ldl -llog - - -# $(SRC)/Core/EmuThread.cpp \ - -LOCAL_SRC_FILES := \ - NativeApp.cpp \ - EmuScreen.cpp \ - MenuScreens.cpp \ - UIShader.cpp \ - GamepadEmu.cpp \ - ArmEmitterTest.cpp \ - ui_atlas.cpp \ - $(SRC)/native/android/app-android.cpp \ - $(SRC)/ext/disarm.cpp \ - $(SRC)/ext/libkirk/AES.c \ - $(SRC)/ext/libkirk/SHA1.c \ - $(SRC)/ext/libkirk/bn.c \ - $(SRC)/ext/libkirk/ec.c \ - $(SRC)/ext/libkirk/kirk_engine.c \ - $(SRC)/ext/snappy/snappy-c.cpp \ - $(SRC)/ext/snappy/snappy.cpp \ - $(SRC)/Common/ArmEmitter.cpp \ - $(SRC)/Common/ArmCPUDetect.cpp \ - $(SRC)/Common/ArmThunk.cpp \ - $(SRC)/Common/LogManager.cpp \ - $(SRC)/Common/MemArena.cpp \ - $(SRC)/Common/MemoryUtil.cpp \ - $(SRC)/Common/MsgHandler.cpp \ - $(SRC)/Common/IniFile.cpp \ - $(SRC)/Common/FileUtil.cpp \ - $(SRC)/Common/StringUtil.cpp \ - $(SRC)/Common/Thread.cpp \ - $(SRC)/Common/Timer.cpp \ - $(SRC)/Common/Misc.cpp \ - $(SRC)/Common/MathUtil.cpp \ - $(SRC)/GPU/Math3D.cpp \ - $(SRC)/GPU/GPUCommon.cpp \ - $(SRC)/GPU/GPUState.cpp \ - $(SRC)/GPU/GeDisasm.cpp \ - $(SRC)/GPU/GLES/Framebuffer.cpp \ - $(SRC)/GPU/GLES/DisplayListInterpreter.cpp \ - $(SRC)/GPU/GLES/TextureCache.cpp \ - $(SRC)/GPU/GLES/IndexGenerator.cpp \ - $(SRC)/GPU/GLES/TransformPipeline.cpp \ - $(SRC)/GPU/GLES/StateMapping.cpp \ - $(SRC)/GPU/GLES/VertexDecoder.cpp \ - $(SRC)/GPU/GLES/ShaderManager.cpp \ - $(SRC)/GPU/GLES/VertexShaderGenerator.cpp \ - $(SRC)/GPU/GLES/FragmentShaderGenerator.cpp \ - $(SRC)/GPU/Null/NullGpu.cpp \ - $(SRC)/Core/ELF/ElfReader.cpp \ - $(SRC)/Core/ELF/PrxDecrypter.cpp \ - $(SRC)/Core/ELF/ParamSFO.cpp \ - $(SRC)/Core/HW/MemoryStick.cpp \ - $(SRC)/Core/HW/MediaEngine.cpp \ - $(SRC)/Core/HW/SasAudio.cpp \ - $(SRC)/Core/Core.cpp \ - $(SRC)/Core/Config.cpp \ - $(SRC)/Core/CoreTiming.cpp \ - $(SRC)/Core/CPU.cpp \ - $(SRC)/Core/Host.cpp \ - $(SRC)/Core/Loaders.cpp \ - $(SRC)/Core/PSPLoaders.cpp \ - $(SRC)/Core/MemMap.cpp \ - $(SRC)/Core/MemMapFunctions.cpp \ - $(SRC)/Core/SaveState.cpp \ - $(SRC)/Core/System.cpp \ - $(SRC)/Core/PSPMixer.cpp \ - $(SRC)/Core/Debugger/Breakpoints.cpp \ - $(SRC)/Core/Debugger/SymbolMap.cpp \ - $(SRC)/Core/Dialog/PSPDialog.cpp \ - $(SRC)/Core/Dialog/PSPMsgDialog.cpp \ - $(SRC)/Core/Dialog/PSPOskDialog.cpp \ - $(SRC)/Core/Dialog/PSPPlaceholderDialog.cpp \ - $(SRC)/Core/Dialog/PSPSaveDialog.cpp \ - $(SRC)/Core/Dialog/SavedataParam.cpp \ - $(SRC)/Core/HLE/HLETables.cpp \ - $(SRC)/Core/HLE/HLE.cpp \ - $(SRC)/Core/HLE/sceAtrac.cpp \ - $(SRC)/Core/HLE/__sceAudio.cpp \ - $(SRC)/Core/HLE/sceAudio.cpp \ - $(SRC)/Core/HLE/sceCtrl.cpp \ - $(SRC)/Core/HLE/sceDisplay.cpp \ - $(SRC)/Core/HLE/sceDmac.cpp \ - $(SRC)/Core/HLE/sceGe.cpp \ - $(SRC)/Core/HLE/sceFont.cpp \ - $(SRC)/Core/HLE/sceHprm.cpp \ - $(SRC)/Core/HLE/sceHttp.cpp \ - $(SRC)/Core/HLE/sceImpose.cpp \ - $(SRC)/Core/HLE/sceIo.cpp \ - $(SRC)/Core/HLE/sceKernel.cpp \ - $(SRC)/Core/HLE/sceKernelAlarm.cpp \ - $(SRC)/Core/HLE/sceKernelEventFlag.cpp \ - $(SRC)/Core/HLE/sceKernelInterrupt.cpp \ - $(SRC)/Core/HLE/sceKernelMemory.cpp \ - $(SRC)/Core/HLE/sceKernelModule.cpp \ - $(SRC)/Core/HLE/sceKernelMutex.cpp \ - $(SRC)/Core/HLE/sceKernelMbx.cpp \ - $(SRC)/Core/HLE/sceKernelMsgPipe.cpp \ - $(SRC)/Core/HLE/sceKernelSemaphore.cpp \ - $(SRC)/Core/HLE/sceKernelThread.cpp \ - $(SRC)/Core/HLE/sceKernelTime.cpp \ - $(SRC)/Core/HLE/sceKernelVTimer.cpp \ - $(SRC)/Core/HLE/sceMpeg.cpp \ - $(SRC)/Core/HLE/sceNet.cpp \ - $(SRC)/Core/HLE/sceOpenPSID.cpp \ - $(SRC)/Core/HLE/sceParseHttp.cpp \ - $(SRC)/Core/HLE/sceParseUri.cpp \ - $(SRC)/Core/HLE/scePower.cpp \ - $(SRC)/Core/HLE/sceRtc.cpp \ - $(SRC)/Core/HLE/scePsmf.cpp \ - $(SRC)/Core/HLE/sceSas.cpp \ - $(SRC)/Core/HLE/sceSsl.cpp \ - $(SRC)/Core/HLE/sceUmd.cpp \ - $(SRC)/Core/HLE/sceUsb.cpp \ - $(SRC)/Core/HLE/sceUtility.cpp \ - $(SRC)/Core/HLE/sceVaudio.cpp \ - $(SRC)/Core/FileSystems/BlockDevices.cpp \ - $(SRC)/Core/FileSystems/ISOFileSystem.cpp \ - $(SRC)/Core/FileSystems/MetaFileSystem.cpp \ - $(SRC)/Core/FileSystems/DirectoryFileSystem.cpp \ - $(SRC)/Core/MIPS/MIPS.cpp.arm \ - $(SRC)/Core/MIPS/MIPSAnalyst.cpp \ - $(SRC)/Core/MIPS/MIPSDis.cpp \ - $(SRC)/Core/MIPS/MIPSDisVFPU.cpp \ - $(SRC)/Core/MIPS/MIPSInt.cpp.arm \ - $(SRC)/Core/MIPS/MIPSIntVFPU.cpp.arm \ - $(SRC)/Core/MIPS/MIPSTables.cpp.arm \ - $(SRC)/Core/MIPS/MIPSVFPUUtils.cpp \ - $(SRC)/Core/MIPS/MIPSCodeUtils.cpp \ - $(SRC)/Core/MIPS/MIPSDebugInterface.cpp \ - $(SRC)/Core/MIPS/JitCommon/JitCommon.cpp \ - $(SRC)/Core/MIPS/ARM/ArmJitCache.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompALU.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompBranch.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompFPU.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompLoadStore.cpp \ - $(SRC)/Core/MIPS/ARM/ArmCompVFPU.cpp \ - $(SRC)/Core/MIPS/ARM/ArmAsm.cpp \ - $(SRC)/Core/MIPS/ARM/ArmJit.cpp \ - $(SRC)/Core/MIPS/ARM/ArmRegCache.cpp \ - $(SRC)/Core/MIPS/ARM/ArmRegCacheFPU.cpp \ - $(SRC)/Core/Util/BlockAllocator.cpp \ - $(SRC)/Core/Util/ppge_atlas.cpp \ - $(SRC)/Core/Util/PPGeDraw.cpp - - -include $(BUILD_SHARED_LIBRARY) - -$(call import-module,libzip) -$(call import-module,native) diff --git a/Source/Android/jni/Application.mk b/Source/Android/jni/Application.mk index d18d3a46ff..5941ec944e 100644 --- a/Source/Android/jni/Application.mk +++ b/Source/Android/jni/Application.mk @@ -1,4 +1,4 @@ APP_STL := stlport_static -APP_ABI := armeabi-v7a armeabi +APP_ABI := armeabi-v7a #APP_ABI := armeabi-v7a