From 0b83feb0680af98e35fb2f54ad854889759b0a9d Mon Sep 17 00:00:00 2001
From: Chong Zhang <chz@google.com>
Date: Thu, 20 Dec 2018 17:44:13 -0800
Subject: [PATCH] adding apex for swcodecs

bug: 111407413
Change-Id: I37fb496042cec061eb1244399a70e92ef14311ef
---
 apex/Android.bp                           |  17 ++++++++
 apex/com.android.media.swcodec.avbpubkey  | Bin 0 -> 1032 bytes
 apex/com.android.media.swcodec.pem        |  51 ++++++++++++++++++++++
 apex/manifest_codec.json                  |   4 ++
 services/mediacodec/registrant/Android.bp |   1 +
 5 files changed, 73 insertions(+)
 create mode 100644 apex/com.android.media.swcodec.avbpubkey
 create mode 100644 apex/com.android.media.swcodec.pem
 create mode 100644 apex/manifest_codec.json

diff --git a/apex/Android.bp b/apex/Android.bp
index 05cc2c5aa6..604b26850b 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -31,8 +31,25 @@ apex {
     key: "com.android.media.key",
 }
 
+apex {
+    name: "com.android.media.swcodec",
+    compile_multilib: "32",
+    manifest: "manifest_codec.json",
+    native_shared_libs: [
+        "libmedia_codecserviceregistrant",
+    ],
+    use_vendor: true,
+    key: "com.android.media.swcodec.key",
+}
+
 apex_key {
     name: "com.android.media.key",
     public_key: "com.android.media.avbpubkey",
     private_key: "com.android.media.pem",
 }
+
+apex_key {
+    name: "com.android.media.swcodec.key",
+    public_key: "com.android.media.swcodec.avbpubkey",
+    private_key: "com.android.media.swcodec.pem",
+}
diff --git a/apex/com.android.media.swcodec.avbpubkey b/apex/com.android.media.swcodec.avbpubkey
new file mode 100644
index 0000000000000000000000000000000000000000..045972306d1ec3e68eecf09c41e577cf10ed9420
GIT binary patch
literal 1032
zcmV+j1o!&@01yDjG#-V#9;G-z4o9B~F~MbPAsLRv?mh<}9xu*67cYL8hAb*haINJy
z@S#~t!$raeFdo4>;H-ZeG#(2FzV=@?Dh(oUeObuGZMq^mwW|aWD<aI#uU;2%_BJ;h
z)AX=o_)37Cw@dqjkXv8pq_NEtO05mdOYc~zZZxha*7@*HY8br=!ub+^3@&+S{`t5+
zi$2|}Nwe-Esh<`saM`#<5@V^swo=KU;7H-G$azv@l$kPHIk3OKFr{4zo_g%k@YL-Y
zSP=XoJ%BBiH`}SJYJb^2&*4qz+$FCED^#Gek<m<o^LMgK#mRu?xZ35B-9O$W;x%P1
z2k9!{){U17#vAZTYZQ;oGq3*tkk|ZJ1Bz=blmq%gu0EwJUiSaRjbW<Gv;je<pA`|2
zxh}WFcM@h5!t|Yj71{Bl&${IV{I86kKu4kjAM``sG6%ItFIq?^5yYZ$qqW`QDbYkJ
z48RPX-ge2YA11^_(n<>#CiMa<3@ZZRg;Vx*^g4jOL_S^QMMLdwNa^7xM((15vWO}L
z6{eS%6$4oh>OOiSNo$O#f&^uU%M;W5ODZ!F!~{Eir{dN>iw9%7QUYcmFu<NCYVZm(
z?j7kiEqC^_R<1K&!W*od#~Hl8T}@l|=#`!kA<zFX9|3;j*0<yj1a#Vm5iYB+5lc1s
zLBQL!qSdo@KgQYB@J*&zr5<x2dB{F>D}ig^JduUDHBrNEGGpLV3opued5hd{?F5No
zwpg659)#e3#=-u@{T%A-#o-6elmXKFohE=N_B*iE*9_ZIz8ZNQ<tie-0xu`x;AQJ$
zXW{P|8Z!CKBJDcEng728Dpi<26Lx%yIaRDmQ2jsWfnPZZk&Vfqz(oskkno!g*axQ1
zdXob<o!fN8VYL^;9LXQqA=I46jCZmL;n}#WkLR%NRkUR8rd673xR7Yw7sBF6o0Dwn
zSSN5dt(F+Z96U1KO6;SfQvd~nhYK0!<>(ZoG*)YrtJxIUTM0Qtb`5$XoYleG;xZ`A
z38F%67kME_>^q$(SAsG7J^EA(RqCWtlp28fpK82jvzHI@FP?vu%n5qVlZ}PuQ!Vqu
zD`;HDc9hu&S|>m<(IZpUH^Z`nxhmg}v4L4iF|BaiIL!!Fy1N$sui33~&q$%#Ry{vx
zJtQ+w>_=}=082=7Iks?^c(>L(CQ~lL$pb5Z>EtQM>6NT7g1DElAdoXo^ObH<Xq;Nv
z5Kra7(sN@^JLWugaxuROoS84n(FLQ8jJ^1kz6kF1dk*qhwgVkza5T*4>P$1RcTwow
z2!{^VA7|j!*Upqbt3#9_5|xB{ata%e9}2WWJ9FJ(oj9L+(Ig~0F#wmKMLZD$aFVd~
Co%B%v

literal 0
HcmV?d00001

diff --git a/apex/com.android.media.swcodec.pem b/apex/com.android.media.swcodec.pem
new file mode 100644
index 0000000000..e379cd3a87
--- /dev/null
+++ b/apex/com.android.media.swcodec.pem
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
new file mode 100644
index 0000000000..e2bceec65f
--- /dev/null
+++ b/apex/manifest_codec.json
@@ -0,0 +1,4 @@
+{
+  "name": "com.android.media.swcodec",
+  "version": 1
+}
diff --git a/services/mediacodec/registrant/Android.bp b/services/mediacodec/registrant/Android.bp
index 653317b4dc..0c6a9bc010 100644
--- a/services/mediacodec/registrant/Android.bp
+++ b/services/mediacodec/registrant/Android.bp
@@ -1,5 +1,6 @@
 cc_library_shared {
     name: "libmedia_codecserviceregistrant",
+    vendor_available: true,
     srcs: [
         "CodecServiceRegistrant.cpp",
     ],