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

Commit 9425bcc5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "cf-vapex" 

* changes:
  Creates a default com.android.hardware.core_permissions vendor APEX.
  Creates an Android.bp with prebuilt_etc for permission XMLs.
parents cf2e66bf d1ba1919

data/etc/Android.bp

0 → 100644
+233 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



prebuilt_defaults {

    name: "frameworks_native_data_etc_defaults",

    relative_install_path: "permissions",

    soc_specific: true,

}



// Modules use the 'prebuilt.xml' suffix to prevent conflicting

// overridden paths, so that this Android.bp can exist alongside

// devices that use PRODUCT_COPY_FILES for these files.

//

// This override prevention is also possible using a soong_namespace,

// but that requires every dependent module (e.g. an APEX that includes

// one of these files) to also reference this namespace, and so on

// for all dependent modules. It is simpler to just use new path names.



prebuilt_etc {

    name: "android.hardware.audio.low_latency.prebuilt.xml",

    src: "android.hardware.audio.low_latency.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.biometrics.face.prebuilt.xml",

    src: "android.hardware.biometrics.face.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.bluetooth_le.prebuilt.xml",

    src: "android.hardware.bluetooth_le.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.bluetooth.prebuilt.xml",

    src: "android.hardware.bluetooth.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.camera.concurrent.prebuilt.xml",

    src: "android.hardware.camera.concurrent.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.camera.flash-autofocus.prebuilt.xml",

    src: "android.hardware.camera.flash-autofocus.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.camera.front.prebuilt.xml",

    src: "android.hardware.camera.front.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.camera.full.prebuilt.xml",

    src: "android.hardware.camera.full.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.camera.raw.prebuilt.xml",

    src: "android.hardware.camera.raw.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.ethernet.prebuilt.xml",

    src: "android.hardware.ethernet.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.faketouch.prebuilt.xml",

    src: "android.hardware.faketouch.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.location.gps.prebuilt.xml",

    src: "android.hardware.location.gps.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.reboot_escrow.prebuilt.xml",

    src: "android.hardware.reboot_escrow.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.sensor.ambient_temperature.prebuilt.xml",

    src: "android.hardware.sensor.ambient_temperature.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.sensor.barometer.prebuilt.xml",

    src: "android.hardware.sensor.barometer.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.sensor.gyroscope.prebuilt.xml",

    src: "android.hardware.sensor.gyroscope.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.sensor.hinge_angle.prebuilt.xml",

    src: "android.hardware.sensor.hinge_angle.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.sensor.light.prebuilt.xml",

    src: "android.hardware.sensor.light.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.sensor.proximity.prebuilt.xml",

    src: "android.hardware.sensor.proximity.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.sensor.relative_humidity.prebuilt.xml",

    src: "android.hardware.sensor.relative_humidity.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.telephony.gsm.prebuilt.xml",

    src: "android.hardware.telephony.gsm.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.telephony.ims.prebuilt.xml",

    src: "android.hardware.telephony.ims.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.usb.accessory.prebuilt.xml",

    src: "android.hardware.usb.accessory.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.usb.host.prebuilt.xml",

    src: "android.hardware.usb.host.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.vulkan.level-0.prebuilt.xml",

    src: "android.hardware.vulkan.level-0.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.vulkan.version-1_0_3.prebuilt.xml",

    src: "android.hardware.vulkan.version-1_0_3.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.hardware.wifi.prebuilt.xml",

    src: "android.hardware.wifi.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.device_id_attestation.prebuilt.xml",

    src: "android.software.device_id_attestation.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.ipsec_tunnels.prebuilt.xml",

    src: "android.software.ipsec_tunnels.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.opengles.deqp.level-2021-03-01.prebuilt.xml",

    src: "android.software.opengles.deqp.level-2021-03-01.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.sip.voip.prebuilt.xml",

    src: "android.software.sip.voip.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.verified_boot.prebuilt.xml",

    src: "android.software.verified_boot.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.vulkan.deqp.level-2021-03-01.prebuilt.xml",

    src: "android.software.vulkan.deqp.level-2021-03-01.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "aosp_excluded_hardware.prebuilt.xml",

    src: "aosp_excluded_hardware.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "handheld_core_hardware.prebuilt.xml",

    src: "handheld_core_hardware.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}

data/etc/apex/Android.bp

0 → 100644
+34 −0
Original line number Diff line number Diff line 
package {

    // See: http://go/android-license-faq

    // A large-scale-change added 'default_applicable_licenses' to import

    // all of the 'license_kinds' from "frameworks_native_license"

    // to get the below license kinds:

    //   SPDX-license-identifier-Apache-2.0

    default_applicable_licenses: ["frameworks_native_license"],

}



apex_key {

    name: "com.android.hardware.core_permissions.key",

    public_key: "com.android.hardware.core_permissions.avbpubkey",

    private_key: "com.android.hardware.core_permissions.pem",

}



android_app_certificate {

    name: "com.android.hardware.core_permissions.certificate",

    certificate: "com.android.hardware.core_permissions",

}



apex {

    name: "com.android.hardware.core_permissions",

    manifest: "apex_manifest.json",

    key: "com.android.hardware.core_permissions.key",

    certificate: ":com.android.hardware.core_permissions.certificate",

    file_contexts: "file_contexts",

    updatable: false,

    // Install the apex in /vendor/apex

    soc_specific: true,

    prebuilts: [

        "handheld_core_hardware.prebuilt.xml",

        "aosp_excluded_hardware.prebuilt.xml",

    ],

}

data/etc/apex/apex_manifest.json

0 → 100644
+4 −0
Original line number Diff line number Diff line 
{

  "name": "com.android.hardware.core_permissions",

  "version": 1

}

data/etc/apex/com.android.hardware.core_permissions.avbpubkey

0 → 100644
+1.01 KiB

File added.

No diff preview for this file type.

View file

data/etc/apex/com.android.hardware.core_permissions.pem

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

MIIJKgIBAAKCAgEAuJjZgFCp6uX+xgKET1FsXYqEPGfYEWUWJ4VSP+Y5fgth/Om3

XCRBhKSD4CPyL/E9ohh7eSLRqIzw/idUazgCqk+yYLiVkYZiuY02jcui1/Vze9er

Nwi0ZSwA+zcvKCEOwZ3PBT6W1kehiQ5PU0IS+78po8LoUrvycmvbXJTHlVt1x2bo

y2DQmxRjIH9xfACwFwh/JnKyr1O2NGjFbk+z3CYx9l7c0Ew9U/kGL3teSbMEi1le

2PApAHYUA+kXiwjF07aRUN+zzSdZsI7goQXEsmqGXNy7Fzdp/UDocayBmCdI3a35

igcPRUryBIf1YdSS+E9DwoXRR7pwzs4ajvVTrzuv7UohTnhPwj95TD0E3Z64r7S7

AT4jtm9gbkAsKNkKOqioGTEIdmvj2prOA4wOUmVBGwOjGcjsyEPJaa56s0WEXUop

+OD2ZMV3StAIwQ5c/gpFzxWl+qATv3MH9MgwAIjT1TDyXv0R+q9JbFbgTtO748RS

MZUb1i2odggNQCWRtv8fqJ7c51H7pUpHXCXElXHysFq2oBOY4J1jXr1craxsPn1P

RcImVwAYTV80jOfmYtWhdJhDavDeD4uinLw+4HeZnFNwZXqCJl0LtLxMDRxoDCr7

YgT2znh9BM6XXg8jekfkDYb5wyloU1eOZJMxF04pGecDB9n1w/OFBA4v0WECAwEA

AQKCAgEArjhsRsNaqvzo6L7lWurxCJO73Drx3PD36NLWXsKNjl113LpEOO1q/KI8

aKXkZMUdM0hB+IEZOSfUJzq9XPge49iV9N0hJJidwpv5WfhQN9xLYx2YVTec8kOG

pZJeqlQQ1kF3am6484HlfjIIQf8BZaH0zb8df0AtQTp0bTtp5pfMYCbLHW/BUiv6

pmhBlhQcHZECWCo2ZGzwcSRU+Zi1mthdnTXI17qswv0rjlK0GYCgkFgHwV1ghTPs

DgjHFIxyES+klJyc2MoDxzQB41dLXkxVhX06Al5lZQUGnIqAQTcKeVZCRrgE/JQQ

OKCMwglbsIk23XdonnbjEvvIaxY1JHjcnPBpOC4+O11fE0DiHXK3GBj5KlfVvB5D

oMWko3R/Ky/T/KJhHYXbC1H71oYueCaY57kHFKk2k3qRJG4DU4MY20cfUZ0vp14H

KJ++gDy0pxxjl4ZUiryBCti5k5GPU8Mm46MLJ/YPdX6Dj1nMtOgGpZkGQYIKPhEI

qZjZBRyZlHeTJsTMc8Eh3/Krimmra5ID95HfJnTTHHshbRcLwL6/zMTU5fkwarsC

f4HQ0602/9HqyI8Ty1S9Z4oByjwfW2uDcosnuOPfk/8XwfLWxrf2+TsAd3cXhOKw

rwUfELzcgYNueLGTJOCsEJfo8NIIEGJCNSgMnWXmIAUIAlrMP8ECggEBAOt9X4Lb

fkrQLjcQ+K1oOI0Q+43htNRYXiG2IDhmDlA+UnqPP+9j2cVyuo4QYhKTFXRbbezR

blUHAowd4hKHtODaHMuq90KbeByVNB8idcIb+ELAOK4Ff+qd9ijrBIOuZZQB+KOo

SlxVjy1LM0QGtUTJRHx4dkCmp+hMqrIc4LQOWd4hV5h85Oj8kp1L1eMvxEStUtwP

tYR80OoOdDxgXcBHLdPs4rc0WunRabGE+cnCMrTy31D95OWg6aw/+XKSTUS5Hfdy

4jDIwP8DR6JU71qNgen+fwrHFeDienM40sSpi85/WQndQW5TwOMbDlEfmgn6D4+s

rVWqFk1XElfwwSkCggEBAMisvdv5fH4UeH+tz5cF5f3ZNY+NX8uj85wCsJAPaAVx

i3t8BqEKUPA6FPt9SDMWg4QtgSSl0NmhH2F9CcAZUCiTZUrtgqyIo80ALONW1FR9

ofElvZEeV2IzKn3Ci4HA2pKRtMcjjVLwxzdoHakbPS9CbdCGKYE3W75Huw410IW6

gV4zQ2mWHT+FxXaatl6Arj0x7DHLeSrMV33uxcYWoclmrAK24uhq2gwhtC8U0SvY

rtJ7+KpCRd5v3Cyzo2AEbZKyJYVKbMDu9RHDZwkZw6wVqaOKBPJVyC++yidksexX

ZT0WGX0f23t+2jbbsNY6H27pJm9ApLuAYwiMGv9n/XkCggEADLlAcNyVLUukQ5tq

JExuScjyHo9kati/dUjW4tU4zsMfR7n3tWKKwK1bQRPHiMNjtF7ASLxkHrn7PEDd

Fy0367I9Pg/lvjaSPdEd+NSu0icaudiS92wapj2UsE9Kdib1HBMjMQyFwAlrbAIV

KgbGwomxZpxHn2Shy95glrESvwfLeUIJ7pZI9AG5lkAjtVu+WguXX4aFwzvPOeZA

B4cZaasu4bV55nYwt1N2R34s1ObmQHqi8EhXlsSj+4eVXchj3mO2J8mQSRx/uQef

VjkKmbTtoQv8J0PsfbMe9JzMXo3enPCqiernfyONV3f9xQpVE1bsglHNJ8TB4bnj

pta+SQKCAQEArDqNrFkAftkk3jgXnX9jeC3O6UilugoZj4FDdjCyz1E3LCEzM02+

T58Z2QoaSDZ/Y5cGaqShjdbaLvp4vtU61chDPD6CU3/mTZBj9i3UiDtXHLeObhlD

WDWft1WcFB2nufmx1OPvbArYf/Ys1rFZHtF9nGU5A/y2EaZQpY6MS+nZFDcdGWbL

7XPrGLMJ6Cu63yyUkdwXPyMnyB6AwVU1P7yNzrqWHnFueNEIawwLxfzvdhkOP1on

yxPoPLlkc4j5XdjlmPNaSXANB1TUfpwNMwlYkdJoEnCLImc16v9iMPyFGBt6fsgz

wFcMA98jc4lo5vDVmtA5Ue+Lj49nsGLYyQKCAQEAoB21vLDm7sLcZhzHFnh7h3L0

wLMFMyQ0QDMWOqrlABcME21CWhibu8XwouF+hHLKX9GjaBB3ujkyeun1x8MpGQwT

1SrMVN4osHpFrCh85uK5mabsqC8YjICIncU1U1ykxDV9v7TXuXgMtUIMKPFcUQLv

ckf/PNE1Fvt5ESn2GIxk+ibM0L2kzHgDFgwiPx+k8GmJt5VZSXwehPmH6jgyCBIv

kPHos1Q/z2LtfdUZcGhwX88mBNBpk3UXjiU8qO+ddoXCRgbThFDqYvOcdacbKGc0

upFMhNsTWocn7CW0rbzusTsTt6bSWCGas8f9G9CMNN6rp8SW7Qc04m6sXVjPbw==

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