tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Cleanup: use shared apex_key" into main

Browse source
This commit is contained in:
Jooyung Han 2023-10-11 03:41:11 +00:00 committed by Gerrit Code Review
commit 6693205f17
3 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sensors/aidl/default/Android.bp
View file

@ -28,9 +28,11 @@ filegroup {
srcs: ["sensors-default.rc"], srcs: ["sensors-default.rc"],
} }
filegroup { prebuilt_etc {
name: "sensors-default.xml", name: "sensors-default.xml",
srcs: ["sensors-default.xml"], src: "sensors-default.xml",
sub_dir: "vintf",
installable: false,
} }
cc_library_static { cc_library_static {

24
sensors/aidl/default/apex/Android.bp
View file

@ -2,17 +2,6 @@ package {
default_applicable_licenses: ["hardware_interfaces_license"], default_applicable_licenses: ["hardware_interfaces_license"],
} }
apex_key {
name: "com.android.hardware.sensors.key",
public_key: "com.android.hardware.sensors.avbpubkey",
private_key: "com.android.hardware.sensors.pem",
}
android_app_certificate {
name: "com.android.hardware.sensors.certificate",
certificate: "com.android.hardware.sensors",
}
genrule { genrule {
name: "com.android.hardware.sensors.rc-gen", name: "com.android.hardware.sensors.rc-gen",
srcs: [":sensors-default.rc"], srcs: [":sensors-default.rc"],
@ -31,16 +20,16 @@ prebuilt_etc {
apex { apex {
name: "com.android.hardware.sensors", name: "com.android.hardware.sensors",
manifest: "apex_manifest.json", manifest: "apex_manifest.json",
key: "com.android.hardware.sensors.key", key: "com.android.hardware.key",
certificate: ":com.android.hardware.sensors.certificate", certificate: ":com.android.hardware.certificate",
file_contexts: "file_contexts", file_contexts: "file_contexts",
use_vndk_as_stable: true,
updatable: false, updatable: false,
// Install the apex in /vendor/apex vendor: true,
soc_specific: true,
binaries: ["android.hardware.sensors-service.example"], binaries: ["android.hardware.sensors-service.example"],
prebuilts: [ prebuilts: [
"com.android.hardware.sensors.rc", "com.android.hardware.sensors.rc", // init rc
"sensors-default.xml", // vintf fragment
"android.hardware.sensor.ambient_temperature.prebuilt.xml", "android.hardware.sensor.ambient_temperature.prebuilt.xml",
"android.hardware.sensor.barometer.prebuilt.xml", "android.hardware.sensor.barometer.prebuilt.xml",
"android.hardware.sensor.gyroscope.prebuilt.xml", "android.hardware.sensor.gyroscope.prebuilt.xml",
@ -49,5 +38,4 @@ apex {
"android.hardware.sensor.proximity.prebuilt.xml", "android.hardware.sensor.proximity.prebuilt.xml",
"android.hardware.sensor.relative_humidity.prebuilt.xml", "android.hardware.sensor.relative_humidity.prebuilt.xml",
], ],
vintf_fragments: [":sensors-default.xml"],
} }

8
sensors/aidl/default/apex/file_contexts
View file

@ -1,5 +1,3 @@
(/.*)? u:object_r:vendor_file:s0 (/.*)? u:object_r:vendor_file:s0
# Permission XMLs /etc(/.*)? u:object_r:vendor_configs_file:s0
/etc/permissions(/.*)? u:object_r:vendor_configs_file:s0 /bin/hw/android\.hardware\.sensors-service\.example u:object_r:hal_sensors_default_exec:s0
# Service binary
/bin/hw/android\.hardware\.sensors-service\.example u:object_r:hal_sensors_default_exec:s0