[Player-cvs] kit/android PlayerDriver.cpp, 1.10.2.9, 1.10.2.10 android.pcf, 1.3, 1.3.2.1
qluo at helixcommunity.org qluo at helixcommunity.orgUpdate of /cvsroot/player/kit/android
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv10516
Modified Files:
Tag: hxclient_3_1_0_atlas
PlayerDriver.cpp android.pcf
Log Message:
x86 build fix: allow android source root to be set in .cf build files.
Index: PlayerDriver.cpp
===================================================================
RCS file: /cvsroot/player/kit/android/PlayerDriver.cpp,v
retrieving revision 1.10.2.9
retrieving revision 1.10.2.10
diff -u -d -r1.10.2.9 -r1.10.2.10
--- PlayerDriver.cpp 20 Mar 2009 23:36:44 -0000 1.10.2.9
+++ PlayerDriver.cpp 30 Mar 2009 19:39:46 -0000 1.10.2.10
@@ -970,7 +970,7 @@
status_t HelixPlayer::seekTo(int msec)
{
- LOGD(LOG_TAG, "seekTo(%d)", msec);
+ LOGD("seekTo(%d)", msec);
// on restart, a lot of player apps seek to the last-played position and pause there
// we need to prevent helix from auto-playing without the initial start() call
Index: android.pcf
===================================================================
RCS file: /cvsroot/player/kit/android/android.pcf,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- android.pcf 7 Feb 2009 05:32:36 -0000 1.3
+++ android.pcf 30 Mar 2009 19:39:46 -0000 1.3.2.1
@@ -36,10 +36,10 @@
# ***** END LICENSE BLOCK *****
# Android includes
-project.AddIncludes(GetSDKPath("android_source") + "/bionic/libstdc++/include")
-project.AddIncludes(GetSDKPath("android_source") + "/frameworks/base/include")
-project.AddIncludes(GetSDKPath("android_source") + "/system/core/include")
-project.AddIncludes(GetSDKPath("android_source") + "/external/skia/include")
+project.AddIncludes(android_source + "/bionic/libstdc++/include")
+project.AddIncludes(android_source + "/frameworks/base/include")
+project.AddIncludes(android_source + "/system/core/include")
+project.AddIncludes(android_source + "/external/skia/include")
# Android shared libraries
project.AddSystemLibraries('utils', 'media', 'log', 'corecg')