mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Modified build to allow native debugging with eclipse.

Browse Source
This commit is contained in:
Armin Novak 2013-11-08 15:16:18 +01:00
parent d1bc0d6f37
commit ba2c31e9d9
5 changed files with 7 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
client/Android/FreeRDPCore/.project
View File

@ -6,56 +6,12 @@
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
<dictionary>
<key>?children?</key>
<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
</dictionary>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>ndk-build</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
<value>clean</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.eclipse.cdt.managedbuilder.core.genmakebuilder.launch</value>
</dictionary>
</arguments>
</buildCommand>

4
client/Android/FreeRDPCore/AndroidManifest.xml.cmake
View File

@ -4,7 +4,6 @@
android:installLocation="auto"
package="com.freerdp.freerdpcore"
android:versionCode="@ANDROID_APP_VERSION@"
android:debuggable="@ANDROID_DEBUG_ENABLE@"
android:versionName="@GIT_REVISION@" >
<uses-sdk
@ -25,7 +24,8 @@
android:largeScreens="true"
android:xlargeScreens="true" />
<application>
<application
android:debuggable="@ANDROID_DEBUG_ENABLE@">
<!-- Activity to create shortcuts -->
<activity android:name=".presentation.ShortcutsActivity"

10
client/Android/FreeRDPCore/CMakeLists.txt
View File

@ -44,15 +44,5 @@ endif()
add_subdirectory(jni)
if(ANDROID_BUILD_JAVA)
# command to create the android package
add_custom_target(android-lib ALL
COMMAND ${ANT_COMMAND} ${ANDROID_BUILD_TYPE}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
DEPENDS freerdp-android
SOURCES AndroidManifest.xml ${CMAKE_CURRENT_BINARY_DIR}/local.properties
)
endif()
SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "gen;bin;obj;libs")

2
client/Android/FreeRDPCore/jni/Application.mk.cmake
View File

@ -1 +1 @@
APP_ABI := armeabi-v7a
APP_ABI := @ANDROID_ABI@

4
client/Android/FreeRDPCore/jni/CMakeLists.txt
View File

@ -80,7 +80,3 @@ set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Android")
get_property(LIB_ABSNAME TARGET ${MODULE_NAME} PROPERTY LOCATION)
add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
COMMAND ${NDK_COMMAND} NDK_DEBUG=${NDK_DEBUG}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../)