Commit Graph

35 Commits

Author SHA1 Message Date
sliver.chen
e11e7e7e76 [cmake]: fix cmake error about need twice make
modify cmake script to allow multiple define about ndk variables.
It is a bug caused by low version ndk.

Change-Id: I92584f050b0cfd5397b7cf85a8963dbe492baa69
Signed-off-by: sliver.chen <sliver.chen@rock-chips.com>
2018-03-07 19:24:09 +08:00
Herman Chen
c7cdadb5a9 [build]: Add libc.so for Android arm64 compiling
Change-Id: I2ba9eec174d87e9d02dff4731287397ab593115e
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2018-01-17 15:47:29 +08:00
sliver.chen
73b7fc36fd [cmake]: fix cmake syntax error about macro HAVE_DRM
It is obvious,just a clerical error.

Change-Id: Iee22c422ff1786d513afd4f8b3d7fee502a9c89b
Signed-off-by: sliver.chen <sliver.chen@rock-chips.com>
2018-01-15 18:19:15 +08:00
Herman Chen
5d6e5c857a [cmake]: Default enable drm on Android
Due to more platform using 4.4 kernel with drm we default enable
drm support on Android platform.

Change-Id: I4690d3d5f65a471b797d2474426836e6e357cf66
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2017-12-22 08:56:27 +08:00
Herman Chen
0bfe09555d [misc]: Update ndk links
Update ndk links to r16

Change-Id: I157ad34ef3877a07cb1a7a88d3c76ebe2e9e518a
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2017-12-20 17:10:16 +08:00
Herman Chen
b186d04390 [cmake]: Change to shorter RKPLATFORM macro
Change Android and Linux branches to use RKPLATFORM macro.
RKPLATFORM is shorter and it is not a cmake variable.

Change-Id: I09a6fe72e7dacedbb4b2b8e1a66b6f7ca625f019
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2017-12-19 19:46:36 +08:00
Ding Wei
785b0f220d [cmake]: Partly merged Android and Linux branch
Use libmpp.so / libvpu.so on Android.
Use librockchip_mpp.so / librockchip_vpu.so

In early stage we use libmpp.so / libvpu.so on Android. later we found
it is better to use vendor name as library prefix. So we fix the name
rule on Linux platform.

But due to historical reason we can not change all sdk to use the same
name. So we choose to use this ugly method to define the name according
to different target platform.

Also we add version to library but Android has binary name issue so we
have to disable version on Android platform.

Change-Id: I785c3bc740f345e473f2d81c5cd2a4e32a1bf0bc
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Signed-off-by: Randy Li <randy.li@rock-chips.com>
2017-12-18 15:15:07 +08:00
Herman Chen
170581176e [script]: Update ndk link
Change-Id: I9935f31fa5cea6d08f0e13bbcda2c3f874b4674e
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2017-12-15 10:04:53 +08:00
Herman Chen
9da1bfaa04 [cmake]: fix compile error on 64bit os
Change-Id: I5b6e961d4786e79748e1a1a290a04424bd3ad230
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
2016-08-19 17:40:53 +08:00
ChenHengming
82e7dbe57a [android]: separate different arch script to different directory
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1093 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-07-25 06:51:09 +00:00
ChenHengming
58cf49779a [mpp_buf_slot]: set default buffer size rate to width * height * 9 / 5
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1042 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-07-19 03:44:11 +00:00
ChenHengming
7965f5dfd9 [android]: fix android binary runtime error due to error bionic libc linking
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@992 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-07-08 07:33:03 +00:00
ChenHengming
e9d3ac9861 [cmake]: add x86 android script for 3gr
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@933 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-06-17 00:59:29 +00:00
ChenHengming
b1066150e9 [android]: use static library in android rather than share library
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@898 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-06-08 08:17:08 +00:00
ChenHengming
0792547b10 [android]: revert crtbegin_dynamic and crtend_android object on Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@897 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-06-08 07:50:43 +00:00
ChenSiyong
8446a6f086 [linux] add ion.h for linux
[cmake] add RKPLATFORM set  

git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@842 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-05-27 09:55:22 +00:00
ChenHengming
7e6fb578d2 remove extra link object which will cause first script run error
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@820 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-05-25 07:21:21 +00:00
ChenHengming
a0723a356e [Android]: Add 64bit script
NOTE: there will be ndk error:

../libosal.a(os_env.c.o): In function `os_get_env_u32':
os_env.c:(.text.os_get_env_u32+0x20): undefined reference to `__system_property_get'
../libosal.a(os_env.c.o): In function `os_get_env_str':
os_env.c:(.text.os_get_env_str+0x34): undefined reference to `__system_property_get'
../libosal.a(os_env.c.o): In function `os_set_env_u32':
os_env.c:(.text.os_set_env_u32+0x34): undefined reference to `__system_property_set'
../libosal.a(os_env.c.o): In function `os_set_env_str':
os_env.c:(.text.os_set_env_str+0x8): undefined reference to `__system_property_set'

Solution here: http://www.bubuko.com/infodetail-1014879.html


git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@613 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-04-22 02:56:03 +00:00
ChenHengming
2600979beb [Android]: fix 32bit script error
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@612 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-04-22 02:50:20 +00:00
ChenHengming
a0ba2b11ce [android]: add script to update library
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@545 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-24 01:33:19 +00:00
ChenHengming
9f274ee171 [cmake]: use release build for Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@538 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-20 08:33:55 +00:00
ChenHengming
41fcb47315 [android]: use libvpu.so to replace libmpp_legacy.so in Android.mk
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@523 6e48237b-75ef-9749-8fc9-41990f28c85a
2016-01-07 06:55:02 +00:00
ChenHengming
1de081d88f [cmake]: add -ldl flag for dlopen on Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@441 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-11-02 14:56:41 +00:00
ChenSiyong
138350d30e [h265d]: dpb size change to MAX_DPB_SIZE
[vpu_legacy]: add vpu_mem alloc and rk_list.cpp to compatibility old version vpu
[vpu_legacy]: used dlopen to compatibility using old librk_vpuapi


git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@419 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-10-21 22:36:08 +00:00
ChenHengming
c651fae624 [android]: add both libmpp and libmpp_legacy to Android.mk
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@410 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-10-21 14:07:33 +00:00
ChenHengming
4ffa74d72b [android]: add Android.mk for libmpp_legacy.so
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@357 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-10-12 20:27:13 +00:00
ChenSiyong
bbc3b15c7b [android]:fix can't compile so
[h265d]:fix android compile error & fix fifo buf alloc may no enought


git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@312 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-09-27 21:16:40 +00:00
ChenHengming
847046a6a3 [cmake]: add ANDROID_NDK path detection using host IP address
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@311 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-09-27 21:07:04 +00:00
ChenHengming
8e0e2c3f75 [cmake/android]: fix mpp_info C++ STL compile error on Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@61 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-07 09:20:40 +00:00
ChenHengming
ef042eb9df [cmake/android]: add ndk download link
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@34 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-05 07:57:35 +00:00
ChenHengming
e3c0fc8412 [os_env/android]: add android os_env implementation
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@33 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-05 07:55:35 +00:00
ChenHengming
cd7f86c83a [cmake/android]: add build script on Android
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@25 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-04 07:26:24 +00:00
ChenHengming
747f44a2c6 [cmake/android]: remove unused print
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@23 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-04 07:20:52 +00:00
ChenHengming
e85b6426df [cmake/android]: add crtbegin/crtend/libgcc to sdk build script
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@20 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-04 06:55:02 +00:00
ChenHengming
f1437f11df [cmake/android]: move toolchain scrip to build/android directory
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@19 6e48237b-75ef-9749-8fc9-41990f28c85a
2015-08-04 03:42:34 +00:00