author | Rongrong Zhou <rongrong.zhou@amlogic.com> | 2017-09-01 07:49:00 (GMT) |
---|---|---|
committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2017-09-04 05:57:11 (GMT) |
commit | e670a3ed370f64e3feb6ee3640b590f6d787bede (patch) | |
tree | f08ca07dfe0b74e63d98626c71158c128e134e8f | |
parent | 05c3ffdfcc36fd8319d650cdf598fd450ed93849 (diff) | |
download | libstagefrighthw-e670a3ed370f64e3feb6ee3640b590f6d787bede.zip libstagefrighthw-e670a3ed370f64e3feb6ee3640b590f6d787bede.tar.gz libstagefrighthw-e670a3ed370f64e3feb6ee3640b590f6d787bede.tar.bz2 |
DRM & TDK to 2.4 [3/4]
PD#150073: [secmem] move secmem to vendor/widevine/secmem
Change-Id: Ib5a789118221255df75acc61d46130b263839e5c
-rw-r--r-- | Android.mk | 55 | ||||
-rw-r--r-- | secmem/optee/2c1a33c0-44cc-11e5-bc3b0002a5d5c51b.ta | 186 | ||||
-rw-r--r-- | secmem/optee/libsecmem.so | 117 | ||||
-rw-r--r-- | secmem/ov/libsecmem.so | 16 | ||||
-rw-r--r-- | secmem/ov/secmem.tzo | 108 |
5 files changed, 0 insertions, 482 deletions
@@ -146,58 +146,3 @@ LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) include $(BUILD_PREBUILT) endif - -ifeq (,$(wildcard vendor/amlogic/widevine)) -############OV################### -ifeq ($(BOARD_OMX_WITH_TVP),true) -include $(CLEAR_VARS) -LOCAL_MODULE := libsecmem -LOCAL_MULTILIB := 32 -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib/ -LOCAL_SRC_FILES_arm := secmem/ov/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) -LOCAL_STRIP_MODULE := false -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := secmem -LOCAL_MULTILIB := 32 -LOCAL_MODULE_SUFFIX := .tzo -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib/ -LOCAL_SRC_FILES_arm := secmem/ov/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) -LOCAL_STRIP_MODULE := false -include $(BUILD_PREBUILT) -endif - -##################OPTEE################## -ifeq ($(BOARD_OMX_WITH_OPTEE_TVP),true) - -include $(CLEAR_VARS) -LOCAL_MODULE := libsecmem -LOCAL_MULTILIB := 32 -LOCAL_MODULE_SUFFIX := .so -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib/ -LOCAL_SRC_FILES_arm := secmem/optee/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) -LOCAL_STRIP_MODULE := false -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := 2c1a33c0-44cc-11e5-bc3b0002a5d5c51b -LOCAL_MULTILIB := 32 -LOCAL_MODULE_SUFFIX := .ta -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib/teetz -LOCAL_SRC_FILES_arm := secmem/optee/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) -LOCAL_STRIP_MODULE := false -include $(BUILD_PREBUILT) - -endif -endif - diff --git a/secmem/optee/2c1a33c0-44cc-11e5-bc3b0002a5d5c51b.ta b/secmem/optee/2c1a33c0-44cc-11e5-bc3b0002a5d5c51b.ta deleted file mode 100644 index a9f9aa0..0000000 --- a/secmem/optee/2c1a33c0-44cc-11e5-bc3b0002a5d5c51b.ta +++ b/dev/null @@ -1,186 +0,0 @@ -HSTO -Bƥ6xpn[ELF -;J - -xD -IHyDxD -ѬKY@K"{D - - B L %QQC63B#%BOq|H|KxD -%C; nK{DYmK{D
lK{DY -SSJF - -i - -O -pCqA"2sM"pCrsL"ppCCqs#V"1qpq -rs -
Oq -`HxDA`hF -` JzDh;`3@mh -p -K" -H!{DxD -F{D -F¿pF
FF!F -H LxD - -O -K" -H!{DxD - F -K" -H!{DxD -)FpGK{D`pG -K -H"!{DxD -KB K" HOq{DxD -K -H"@3{DxD -HxD -IxDyD - - -2IxDyD F -H@/2 -IxDyD!FB*F F0Fp -V5p -تBؑBبB3B -; -ܸ#fи*fи @X.jи0и-@_U -3h6C{j - - -G: -`H`" -F<F - -AEq0 -" -" F -#x( ! AqFFT""XF -;< -E -պ - -o0$ -K9 -8 - -1YE{ # -;: -q1JzD -ȿ$,($+U -+, -Jh01 -F - B FAFh -9FJFCF -8A0F=_z1F O#F{OO - -!F - 7OE - -!F!F!F -ch" -FKFFF;F -:/FF -74 - -50_( - ( -(
(а HBHApG pGA -@6KD FF -{h[B{`O6 -JzDx0F;; -B - 0\>HFQ2F -1 - -D; -O - GYh -O - - - - - - - - -: ? -E; -O -DEмB -!F -(#FF -*Fch - -FHhFhR<R`R,FhS`i`HiGp -R#F -O -T!8 -B -T! - Bت - - gE5T% -F -Y%:F5vPFshB -Y' -&v -OD - *F6MFW -@BF -FFF!F9FBF#FD1F -FFF!F9FBF#F1F -FFF!F9FBF#F;1F - SiJJ) -A @@ 4!R -"A !@h@2l - !!IP& DA -B`! E -
@ ) 0 -@B - - - - -$ -d - - - - - -o/Dyeڜ - - - - - - - - - - - - - - - - - - - - - - - - - - -t -A -*D diff --git a/secmem/optee/libsecmem.so b/secmem/optee/libsecmem.so deleted file mode 100644 index 279696d..0000000 --- a/secmem/optee/libsecmem.so +++ b/dev/null @@ -1,117 +0,0 @@ -ELF - - - -03/K -yD , - - - - - - -@ -@ - - - -hEH xDA -BHxD -z - - - - - -[I@CZJ[yD -F4WI@EWJyDzD(FFıSIOpRJyDzDI - - -Eh F(IOp(JyDzDI@OJyDzD~IOpJyDzDw - - -9I@8J9yD -9IOp8J9yD - - -<IOp<J<yD -F43I@_2JyDzD00FF4.IOp.JyDzD#(FF4*I@a)JyDzDj F4%IOp%JyDzD UF"I@c!JyDzD - -6A -XFBF - "O@ - - - - - -G -xD -!F -(FoBF - - GpGF -pR@ -p@ - FRR -Nreu h -.,dp
.pldpcp. -pJ -pJ - FoG - - bh^h - -(0H - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -A -"&D7zXZ -uU7cm|S%qJ`rG4X:wLd|Wp$H;n:ܪ1xټK8DpFf2p?9X=zW= G(M|./ZIjzTt)M|AD͂V.Z\fc]|>O
Ģ},E+]XR:>I=523NHidKb`r {+E+Нƞr'VQ>;ECxf;kУ[ Tllls KM)^D#]7H|yV@ -f<k@
_K[I%iQ3,t_FgZ_A nXfWBSUMrؠdYգ쇇aۥyΆ{O²:]sp0Mf: 6:8<}x`یrT_Z=LA !`K -U3hs#b*v_pXX -jKT5:oVlvB\B -܇as,|!uU].nbcٔ&2S[U SX1FVlLdl_z>O&~0|(ǑM4AYY -/}'S#kyqiP+]IU1DmSl2/ 3w2鍽Ƹ}F+{#OԖQa|(3:Q#Ӧ^]`9e\ĸ *"ЀL;M[04(aP
UB.)IuI0/CX<FH1:α(0ilL$0UJu0]ĽGrk@d2,{ݔXMá*0+7z | ж1BA||mr "g1qp?ynB]:6u/M -J)َ6*{!:sOϣ/c@S<|03\>}CzFʧ¼+i٘ hESPi)~Ntl化:/IԷ<n :&_1҃fAm@I=EAӔPqhl~e{ÁWc.僨9[ꃨ:>4cxx -ujQKA[#WbPǀ(\QR{xJTu]k$>yy)ߢcEϙVMI,9)ZKrJQdjA}bpϯo>7N'yUXɇo -}Mj5[lCtO?W -wwfyP~[IςTtFڢKA -"q]ǟco7g,x4;Zc>.[͜p2Y@n̤"5SWpW,6Ʃ,n_9>92$G
/o\/`#I"UCW*Q1!`!H\,=Q6ْ%c jA*6d - - diff --git a/secmem/ov/libsecmem.so b/secmem/ov/libsecmem.so deleted file mode 100644 index da156a9..0000000 --- a/secmem/ov/libsecmem.so +++ b/dev/null @@ -1,16 +0,0 @@ -ELF - - -03/K -J9F+F - - - - - - - - - -A -",Dlibsecmem.so diff --git a/secmem/ov/secmem.tzo b/secmem/ov/secmem.tzo deleted file mode 100644 index b2e2b2c..0000000 --- a/secmem/ov/secmem.tzo +++ b/dev/null @@ -1,108 +0,0 @@ -"4r3+[Z -ҩs.*m-ҽ+oQ _!vrWX?REH1/#OS'MşQnqCQ;@~e(xR4V]Kc: -q$f8/MR@79<'e~Q) -?RȤ?Qgs` -eHZt04Iux 5!pKV1n2u6l,@|,Ly(l8E~є=._˻$iJxy%NƶV4?Tn3-wH9ْgÉ8,a7!y.BglO -7ߪlqrB@aaJ|֙eY - -7
OqV]OZ4a%c -Q':b{3V -7MECmP2\]i_fg91x0ljW(`p?L
/ómvngbMFpwOk ނF" >8LđrWiݞ^Q=t[V`P 1IZ}@0DrjVqm ܷV{5~)f9eQvnv?bG[-xCeh]XGn`#.>^q:
T+ɥPFJ.tV9Z!ҋA9[7/ZFm((שYT
df(/s
onIyI&ŅL\ޔt6QZjVo9b6Ap! -<k1}s6-E>0g[9Ƨa*tJЂaS|lE2M5D٪TZ]gTH(>`S:<(ؚW1ԼC2vƾ&էߊ_0>l}9Wg4\|2 -"c .Үlzd,LNw}AbQr`h -O~J+<W{LfsC#Z|lΌA1z{R)g4kIJм`!Erθ~ZLddoZdUYh3&{[. w7+bѓ'{I~Нa&(.\"P&si=GbEB7r1_[3jR}5
ѽ]'Ǜh]Wdr`2mh:I-7{^Ͻ|Z~O+p-PGsHVND:EՒ=RұwO}Sp&̢BƟ=MsB -")ӕxF@"헣%x -QQ_3h=3g&PKZC -6.7.1يRfD?f=L3k)ԊTU1=-QPoyȏZ } -Ǻ(_- -Lqhwo9i:+2#?+|1uec -kPysOpM"4ԡ_yZ2^i&1
VxGAۥT HE|㑌ik=3 `MBCpgek@#50 ̄z0Tc -9\5 ]OzΞRElQtKͻCqMuJV0Pzn -[ ]^Vu`Ơ^m{*T"yi`նL'닑gx >Bh(u1#&U>v+q-УqٓnSjRAQ>к25PlT6'KcDrfÎenŔ1KnhAߌaqE}r)}fa0$
Nx/ߞJ5/S!DQj:ɶsJhYcGSlfOd~9,&fZylfRlo 'A>Cּ S* -hNZHH^[ `34v -gZ_?
cG!}Jry?[I"g[Eފ}2vaHcjS#(f$ -xHGpq1Z6I
dt D):ܱmF'riՈfл::{P,`?YRZѺgyP`tkhzKH{]A=i7Q"3'F2> -ck}),\UCð4܄?7(qx1{IG֊-ljސs$yP'ӇI
0C<.nncT$7J:P"VL 2vNxdWE&)t5ąY`!x0v벊IcT1b1-8!F;u,{d0i0}m7c>m;m|eХ(XP-3(ŕOOE9C]1SP58;0(X#hyeBת@V*. -6Ugo/DmTf-!PߡGF=&bPBjMY~,6{ J:EVe)e!faIeƤz
uP[|[_r Ss]^5\S˗KaSQ}@˄>mKWM.4=~=|<6Q!xː}:r4a5TnHs}Ye 2X*HNe4JjRD,AiE'ROu4IItLR2.F)YI@?!EChHl+^{CL`AQƋ4۫.#$tFiOD!e| bM[[%¿AϮJ.L U+Uͅh[ͧԟׄ،Kv*>V+aS.M$v> #㽀Nzo:! -Q.} fvOr, - -_`nqӋK"L.mƫµ)v] -ObJ<cK'Sk$D
x~8_]: ->GBi$NJ|Z(^
=jMR8
oT$; SW\g -ć윌Ie>y3엯"M΅*CArDLш8X'gGA3m6A@u{⇣RWI@1ʶ}}"? -cTy*M2|Kz Đ<KS $MIߞ/_@K uqWtZ)FqHf8N)%ѳ,/B;6dm^a,hi|gw_|Â=SO zʫЂRD3RK8Vg+@~."E\GgVNDR`?HT,D,d>)&(j|»Uǥi PZU -lkcļlfzsG?7ڧX$B[xyВ3
GțY?wLmІW'/"-`| Bpr{^O{yӾN6"N/}P$ 1j -&(`r%lӕyEUfM5O=Cap|Y~Y*vW==:8o|at{Ŝ7لK6T5`o(hAO8~PDSI/3NQ;?<2 Eh,由`v_%!+H8GkaG'!{SF.l_kQo
8?$3\SQzh~JCwRή#_ʿ7Tz%T]DЋ
~!(OBb\ј^JA.ɷPR]~KY7-KpeKdoc@Zzz,"LE.)YN1rU&*.fH94&٧%ݸ'y @91֯RKs\=j
4c}QhaW`ԙ&MQgkOmE.L=3;b)_6<l$"PHG?.=Tj hNQeEukT1 O'dwZMEmטD6*;G;r(LR s`=fXkU'o^'}Z<>xZ^61kD欫֕5x~s 8+l2Hq?*Y:'kω8hOf*!(3Ԝ-jCZM} --쮞ymq6:n -
hP~k1 -C1U).EZxE:1_8i_rQ}rӖqPCg r:T0"^6ʡJ1EQPbp;QfQܮLḟ|&CRJvƀh%[0X{DPuk F+c*s75[ф#% -:,9nH'syo9E0ykΧ4(خo0LHp>8jGt7Su<hw.QҦQMnҎYC_H?on[=phP>h?(E>2Z'M`/|x6ҕwGvȫκN5U -5ʮRx!Gzzm̭=2~ƓqQ&ղ.swxCx®E(yPl1zr9!Xt>2<&@ODPdFA|Y6E68/!5g
FcOJw/96։3;'c -BW76tK'__?
BgZwV!ms`ڤ},CyE!6>3~}4bC]u[dq3n/H9v^P -$mi -kŶI?ݕ.LI -.uBm026H,OYBΤGjoRMKz0cAj*~z8xXL[_BiHxڸܿHzuw|J2L%/RxꏘW^T\ P^%\o!bʰlR(4,kmSL.?>lOq e>zS<3 -E;7Zb{h,,JH -yd% -hK1f,#SGEAOTs55^htOK
g-%2/Όs>DM -p[`!z*Q126mO9;^.+DƨmC05nH6;~ JJ -J̍k@^MM] -I5aQ?DgdQx)(;k澔=sdCz|ZJD纀KUL8AB0S%2>@F8N_ / -'^l~D<ErC
O&ػߛA=rO cK]2Ru7eEa[f䀭`B_3:bߧ8$Li/+B!_b~ʌ/Yb%{x(ńSmJ./wYiBM7-;+9eX!^XWCB;P$lCnȉO]HyeqI,a܉43݅# -y=嬌.ӆX/ -:Z -[qqNFV=mza@q_{vU
>y -a_G2kx&?w40y"BDGNL]>7t}j"
"1W7@尝 -N'ޫ1A ӜfwpE -LfGpOc-:"]_*|]mh7U-Jߩحl:B-&35ly(MA'dRQM0o+Mn}K;-y=Q)Hgoi -tim#ojms[av/"\s& -40/n=Č;YV3h}wD_Y@Z*0uVfD/5.c# " -& -rk - <r۸4ڎͼEСD,mpod@{ekoߥ,l#IJ!V'eu5J -PP<F>2ON=3-3ߑev3>p+m
:ԪQGi>1aR*5Q~[ר -N
0];>m<DfJ2z\:&SG2.l/!GB&J
wvڽ-rY*֟n7:0 -dO-S[~MF -+KFv6ѫpәkIl`gl -nr-`JftuLGk#
㣈/f~q*7z9?qYJIּ]lЊ=+F"DE -Qr&rhTg>AKɿzXWLLJBps/8μ-MvE&o#k'~<qۄޭJSSf -4<x1 -d|n\:Ɖz:hEAjv!? -tj4hc!5g)noZϽ^S -BF?j@GŋniSpRA$
m -N\T4@JoFr,z5I!vRj
iV&Ilc<pSab9"6O?J%mʃk|Eh=7ٺOv?t -/7,:xbGH$:Z-'lx=58Bvbjm봣m$X;yd !:y
-͝H -??e;!_kz -^jکg&BdZƙ#^9$$Zg! -`Rpj0A.3d\tY6Q^(*}Z&{ww`q5Z,#%K[
L^!7Os%ǐBڢD QJKv˾OO)#8 Ulwxq_<9ghԩCs8'KN4CY>>hG^rej5?} {,ZQ~8 -8m!-M
m_b+77Lԟԛ\q|Hxo*AmΆ[hGc j&mub62Y3Um&wnQ߁[n$ȧܜ?I\ϭt"X/!lK==K+45gY6%w/E%"Kғڌm94$5/*Uk6<5 -7lXLq1 -`R)V_O.|IF^S]]HaW`pk[+_moA{zh:76~Tbuf9ZKUP/j5\XɗV09uj홂Nߨ\'z6}X!>GjYWnNE[qHH)%ބSmX0s5Nϋ|=;:7|Wc=Dn=hd!lmZfﰾmd[
DŽ8・T,0x4~ř)Iq>Oچ"sb[c.T_CoͤJҪ\gnjMZLݳѺoy_ֳ[y -V]V
ħSյn-`q"ڟ'*#M}1{9;9/bm*QQkhYb$uMXeI$6|=?|XI,}'3WFYF/[T=Y~0\KrPsdv' k)fu>:Dg.;3?6w"!XW0OuÏhzCNK7G\y:H0jG[SFjPXIőX\@[\<0jPf -X< -aؔq)iRɞ8<x½$
[_˺oC:f î *{?9oK -z -{W܇-j( -5LL-AbXFH.2CV6PU(Vys{1-9ot14DS~r~ˊF[K8#mL?3.ugsb<L2H$+~w,lוsk8@C
k#rO+U@_sp1;cK,o͞|gJb-!$Pܛ3+8&clgY&aɔ*߿H'O'iFĨn -RYᮔ5P=m&ElrDOj{eaĂOU *SXNGl.!LxWm> df5"mʻ(Ҋ+r9BiN%7ܺa?H^1o`#*GV$hj -dT)@eش97Lp& -
A -gU5ݧLfкW>drcr(ɴ_G,I`>&H3QN$ܚ&+6N; -7vUk@/bZp0&%_\aE_MNU"P?Y,Av" yIT.c& -j2Ogd%M(~M$Y-XZMpW#J[:+Tzg}UIUW}~& -V%I=(H6ƖT
)KvJNLt] -Cmۼ25G5y]JŘlu[\zAk*HvB/]
&+/ ]PoLuWUDzE &۾((΅%xf}h*[;6( -x_sR^~P:Vf,=nӱ&ZYblu@!\p}W^!/*yȫ4s2U,Jń/PM*ZL3?Ub#39(&)BRg_!ٛsl}qHMz*|<Ѱ{AY8PX_#aZ0o
;K6۪*}8V%Zw~JlºB? M{6w15D'"+Z!5ɷƷ-$2#j>P)1(֦X7F<) HV|둍TѳPF]Ob`W0"vMR -͋- 31\)ԗgK_ -2҈Ybk*%]'ͮA&.3;h4KEKHU0)wm -mNJG6o%?ՋE*f{4d?%N;}+^ dZt=?Dgmki:^KF\zyia\tG -Y ]N$fumuN7؋"R2-bo?M?!*C3< fwKI.J@(X)(U3D4nI biZwChqU~!ն%F~ĬB4 -!fuqC97mcZ!WZvSb|٣ * -&StyFiæqv݇Qòwk1)-&;6]C=*? -r^ ޠX>qV_Wh'yxDiKG <⏕K1-滦QP:')c vAm/Zs#j4
AVxHeuyX7Ry'&dsIIPr2Rҫ(KKb -箚־#ۜgS/#m7:FTn0s&b@w^p-.Nk^=MǑ9Nh~+7RW![.8`¡%NP|Ӡ]-4ԛj_7)dݲَ_龒\'x+#x^=l#NGuZ#9::l[[hPBzЮ%Ok -Fv|Na }
'_(, id<C- *<(u@p85?3&t'b{e1Q5;kûvN͓Vk?`;M'L(z}@ --qM|pq]JH<RҳIXfwuJ%|*t]}r_G$I S[lhZK6^ӴGd{ {BI -澎YڍK'},Nѻ -" k 6z\x,NJam8@=,PnfSbI` 2㏰/m!xs67*!n]m_;zU)Ԋy.JnUIG݅ۏo<4)]amiM-V9@q#<dQqJR3e΄iP_v-īLFKuM_j2"JO~65٭Pw./bM\ -9{}iOfb.g!&N*+B`Hc.R~8h( `TN'jxos)N0?Ȑ!{Z0Y -҆S]l |