Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e710d717 authored by Andrei Onea's avatar Andrei Onea Committed by Automerger Merge Worker
Browse files

Create apk-in-apex to host BT apk am: 8a2b4933 am: b4db0920 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/17191419



Change-Id: I8db4883561bb9feef666b0d3ebfb5a3a639b745c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a3307956 b4db0920

android/app/Android.bp

+8 −3
Original line number Diff line number Diff line
@@ -87,16 +87,16 @@ cc_library_shared { 


android_app {

    name: "Bluetooth",

    defaults: ["platform_app_defaults"],

    defaults: ["bluetooth-module-sdk-version-defaults"],



    srcs: [

        "src/**/*.java",

        ":statslog-bluetooth-java-gen",

        ":bluetooth-proto-enums-java-gen",

    ],

    platform_apis: false,

    certificate: "platform",

    aaptflags: [ "--custom-package", "com.android.bluetooth" ],

    certificate: ":com.android.bluetooth.services.certificate",



    jarjar_rules: ":bluetooth-jarjar-rules",



    jni_uses_platform_apis: true,
@@ -203,3 +203,8 @@ genrule { 
        " --minApiLevel 32",

    out: ["com/android/bluetooth/BluetoothStatsLog.java"],

}



android_app_certificate {

    name: "com.android.bluetooth.services.certificate",

    certificate: "certs/com.android.bluetooth.services"

}

android/app/certs/com.android.bluetooth.services.pk8

0 → 100644
+2.32 KiB

File added.

No diff preview for this file type.

View file

android/app/certs/com.android.bluetooth.services.x509.pem

0 → 100644
+36 −0
Original line number Diff line number Diff line 
-----BEGIN CERTIFICATE-----

MIIGOzCCBCOgAwIBAgIUEiZapaWZVSter06CJMf2kHi8PIswDQYJKoZIhvcNAQEL

BQAwgasxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQH

DA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYDVQQLDAdBbmRy

b2lkMScwJQYDVQQDDB5jb20uYW5kcm9pZC5ibHVldG9vdGguc2VydmljZXMxIjAg

BgkqhkiG9w0BCQEWE2FuZHJvaWRAYW5kcm9pZC5jb20wIBcNMjIwMzE1MDAzNjAz

WhgPNDc2MDAyMDkwMDM2MDNaMIGrMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2Fs

aWZvcm5pYTEWMBQGA1UEBwwNTW91bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9p

ZDEQMA4GA1UECwwHQW5kcm9pZDEnMCUGA1UEAwweY29tLmFuZHJvaWQuYmx1ZXRv

b3RoLnNlcnZpY2VzMSIwIAYJKoZIhvcNAQkBFhNhbmRyb2lkQGFuZHJvaWQuY29t

MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsVlq9pozUREGlb8u8Y0A

fYwPs5OuavNx/EsX03aTjmAXUfSOMAewqzUXDIRjw8UQvOW63utaZ0go9osDPzNf

VEftmGxW/AUC+HWGaLDQfCYO3ficPPOS7xpEhGZERNbnhvh5qX0NBt6mJygsfpOm

RPThbi6Ig2Brxh1eqVYqRkTjhNFKD6gCd1PdMmUSF88xEYaZWvTkET89Zh38lLza

2x/wfNZmCSAVurNw1Kf9NQfYsaGHwMsjrvTyhG93TTYXzRBFzAO2WlBiw6R0tQr8

ZW5XCM9Yo6AS0KXiU0ZWwOXxhGdr38rNd7j9nZtpFwWmN1kgeb/vpEfq0Ylua9By

uURnfJZu2K4TbFamuyjihItra2ZKOtFNPDeuggKMCkuZz6WU8FCoMEpnq5P2agxN

OGAa7ynXdNzek98N3TGX8qtfEgCv6vyuM0gakJ6D9nM43nsCm1LkB/JA0CacWyRz

ljaLL1C4S43azEOYyOOb94ITnkZCQGtH33kxzamyPLIZ37VF4+v6yTXySLBzOnhe

Os5uBIDohVJuI838bLhZf8e5mIrnjiKwsmExXiQvgidbwvZKCz9n8YT4iUhWPx4F

W+GPcivZsvsECcnJ2QURK1zhir5QuLS7ZbAth4kiEUxJ6ujF5jftE+L/ClK2LiY0

2IXWRCct8J1hfJZZx8lm3PUCAwEAAaNTMFEwHQYDVR0OBBYEFO5CgtQzKbTEd/Q9

rxK14a9BBwFZMB8GA1UdIwQYMBaAFO5CgtQzKbTEd/Q9rxK14a9BBwFZMA8GA1Ud

EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGrGS1zmaoARVq7qhoY+xzSc

1I/Tzf6vG6aHBC+CcIoSM2oqr6TGH+ADHAY6jhu/qzv1ij3gtoInAkBtkWvYsCIV

eISPj8Qomcd8EIeW77p+ArKzS4HY5m1c/O4D/5rkl6c0exFq4Pdw9V8xyM98QtLd

oj4xzzXUTPOIwkROHkj8otcML28m/MC0l/4b+flHnPqKFuLBjhxi9b/ZfwaXfjkx

TcXpM3nPH8zN7kaJpS1fPW1IJyxJYvT022uK+afpezTmyS/50aOncUGjDJRw8CcO

B88O8lpizDD3tD7P6jVOpRRJS4SnkVErbIn1xdWER6ubhnnycH7UmDVIx+vNd/t6

YDa377au8Za+LnbDPfV1+Og+RaJSEIjJgfYyqnjBxGdRGN21VbqJdRzo/eO4ZFd2

mGVtMosVr0jw4O8r60o9oMMWBTbFpxOI929QdcV+X1Lz8A8BZz0faXfZ2Z9usctu

W2FtZge3tsJ07z7kuhNdbnm2yQVfd0FqiJsapUjlhgcdFVoDWPuqOfWAoG31ble6

eiNnxfjiCckPWyciIE6lw97nvavGjlUacH5qVG86hOWU7xyBgeQ0PH4e+Nxr50yU

A0GMxni1gefZFG8qEPdNRuDT1QdqDGh/8Ea11GEUMXdAxk0UzqyAtLDr6MbwK6lV

mqmeueFdogdjvQ3mXe94

-----END CERTIFICATE-----

android/app/certs/key.pem

0 → 100644
+52 −0
Original line number Diff line number Diff line 
-----BEGIN PRIVATE KEY-----

MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCxWWr2mjNREQaV

vy7xjQB9jA+zk65q83H8SxfTdpOOYBdR9I4wB7CrNRcMhGPDxRC85bre61pnSCj2

iwM/M19UR+2YbFb8BQL4dYZosNB8Jg7d+Jw885LvGkSEZkRE1ueG+HmpfQ0G3qYn

KCx+k6ZE9OFuLoiDYGvGHV6pVipGROOE0UoPqAJ3U90yZRIXzzERhpla9OQRPz1m

HfyUvNrbH/B81mYJIBW6s3DUp/01B9ixoYfAyyOu9PKEb3dNNhfNEEXMA7ZaUGLD

pHS1CvxlblcIz1ijoBLQpeJTRlbA5fGEZ2vfys13uP2dm2kXBaY3WSB5v++kR+rR

iW5r0HK5RGd8lm7YrhNsVqa7KOKEi2trZko60U08N66CAowKS5nPpZTwUKgwSmer

k/ZqDE04YBrvKdd03N6T3w3dMZfyq18SAK/q/K4zSBqQnoP2czjeewKbUuQH8kDQ

JpxbJHOWNosvULhLjdrMQ5jI45v3ghOeRkJAa0ffeTHNqbI8shnftUXj6/rJNfJI

sHM6eF46zm4EgOiFUm4jzfxsuFl/x7mYiueOIrCyYTFeJC+CJ1vC9koLP2fxhPiJ

SFY/HgVb4Y9yK9my+wQJycnZBRErXOGKvlC4tLtlsC2HiSIRTEnq6MXmN+0T4v8K

UrYuJjTYhdZEJy3wnWF8llnHyWbc9QIDAQABAoICADEPvYlu6xdYEGxIsWHdUe9p

Wcah6jRoGHZlB7hWK0fNyWXAs70Rw4v5aeDqlvbHg3PeUa3tidrcmYhquIE5Yvvb

0hzCi+W4NTQqvv4jO+m8VYyOhBpQf6tppt7Bs80fbnlmL7H1iC8IVQqsEHMLwYl9

/QcQFG/TsrzhzxglYBiEYjSR+V0Pa287YgvY7gJsLPTeOXpyGM20ovWnAgLbo+fO

lCbU4PFRUPGPRn1t45xSCV5Kg1WQXNS/qn98npJbjoYKJGTl+gJODqR00FxtJ5mf

xrAHPEw3sjzKRywmX0WJ1yB7w9nrLqAaKv74yT+3Ll5NZ7CGqnLV+l3xGPz2c2Xa

xbmXNmvlybJOUBfI3Bx1hDNRFpBBe4GYzemqyOPpXf9XBDQCcOGBhYpMiRl5jmeR

sa3sdfeiPBGt5BUkCfK0dBgkE74Dd24tlg2J90pNCWze9zU8z9iJ0oC+OBrTv/4Y

vX1Aba2BnZHWG9y5FhFst70S2DYL8aV5Wc4YPd93YNlF0d8klL8a3rHwz9o7nh+9

sMfEJOV5tMVtajJTcu6oN98EDXqr/yvb0D+A4JNAe1tHGbKMpnT046mrX78Bg5pG

V73U2joHQUbhlxFZSWDdjX/CdNzgZCVXtMoSSJT1hhnKGUc2a9ex4Zak6017QkCY

IlnBEduk7fedKRKuWlNBAoIBAQDsEaZesHjErmBiInMKa1oMwZB6uqKLsNX4IYgi

7xTgu1IeuWmnWfAl1ZaHgMlTLKTq4emk+/qtszzfjhBLzRlkofwZBRY41Fv/32jE

z6ysMN8EOKNSOStBzWnh2sFVQsFPOLTFVzPEhBBUhzT1ieXIGEadAF5USO+AtL3S

woMFJdfjYp6NQTkb94S3+cRiewUtn/5WGQb8sPDxzb4Q0ulaT65AFHCY+8kGzyA7

Ezsildx/LHxvDkSdWKXhdG/LPDvJC1oxW6dpa0mIiSV9OIjpECVXHi/F+HmjXeoA

5RcV0wDzIS/QBgmAmJTt++GOCmNuXomHQNjWD0OGfbj9LobZAoIBAQDAUpy8MPyz

LcAhGlJxCsnjq59e+0G+D1nnG8DYmgMGlqL1mEyW/kY1eM88s+Xf9amuiIYfyULG

CL8X0VDrkPk17Jsc5vtowUbYkJ+srV2RxgeJB/tkJLNgzEOp7hCXQ1TSmXmyyjR1

5rY729pKt2j6frEeaLOE4kgRH9kNaav9UjtK94F81K2eQsRt7fd9qpFwyeFik3zi

2nCXVl0hDhV+S0j71DwZ/VJ6fd7kyd6u8Q4bxZ83eGgXijhObx6wiRQ1ER/K7z+1

Pvj6UDhlqju6huhMY224KHqGf1SvUFUzvQtzL375WrZCht8IsVdf1HBeu7vRqcHq

mVpeq0npxg19AoIBAQDnMRXlUCDGRhyAn0pZHu+O5JaRi2ybL/EtU/GWfNzOhsWS

73TIf61P8FC+neMNQQC2Q89lU52aNZpdOi09fzzqMDXLbw7nUxpSicJ6VQS/khEn

eiyA3xo9FGYo2etTi8/zvQ5U4eUCBXBUyCGWgpl2EEg/hFfdZZyhSOFKolJcXUaE

G1Y58nFysULaRpMM+3wDxdf5DAOqv8MInL0SjuwYFUcK3Lm1KYkj0P+4u0nDwk6y

gafPv4J1MpcqKLU/rdrDNwn6os9ez8KxI9eCPjbfQX/ARQD2ejTuSJBelf240u/w

LEU+DluKBGR+eZrZV9UvBwjbXCe/5Cz2bvQXiFRpAoIBAACbgjE5+mJaf6PbIG2I

+jBE54D2TDPceo03Ujmc6uuHaEZcT8meTfx3QDhR3SUC8qFBfyL0kMhtWKUrnRTR

ZWgdMjQ6KosfKSkf89EozwXZ2UY+hzW+w+5HVuNfhB/mL4tmvrKo3teMfgDcZekc

gTFhWw/chsyhplafgiD/t3JaYyOOepM5XL8GOPab7M8xzbnMeXDFRHy28eoYdLzY

/YpjlHxvJC101mDaquyQEqr8ye2ehy02rSV940WkJjWqiSzNvAr5DHt3EnQ/8p2n

lv601GEBY2RUhGaOWmcfWtWKAFJB0SXaen7lTCkL3lnIIv65mxNDdQBXsahg5B/f

50UCggEALYTJLCNlGo8JcEos/UfJ0wYZoQL8jv2mem/x8P0G/0YLRam4NlNiwJyx

SP2gSuSiSh8XudlFjAm6/cencriVcvpIXFpEjrqhW99cB1WnLTH/KgNSwrcbwKUe

TkdUx0nDzpwNlBcxFWZONMM2PIbw1vsHgxmMVJUkWFjalCjspgMPYD3+aQ38Cm4r

ijMF6HOfo8pPq0GTlNy6mI9YsLPsp3H16YkTTSWjE9R7cIde3H8WmTnVnUTH4K8R

KjtGoLgVf02wncdxGmWNcvPLfRkin+r9V4fp2b06evB2Gq07vxcDzky3P1Hgyixj

MGM6YXLym/x1WxR7mOQvAwpSJ093EA==

-----END PRIVATE KEY-----