From 68169109d040b69092c3a943f7c205659e26cfa7 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 10 Oct 2023 14:07:06 +0900 Subject: [PATCH] Cleanup: remove unused old thermal APEX Bug: n/a Test: m Change-Id: I3244eafa2e97736a3767a7c21d806dd5e5d742fc --- thermal/2.0/default/Android.bp | 14 +---- thermal/2.0/default/apex/Android.bp | 55 ------------------ .../com.android.hardware.thermal.avbpubkey | Bin 1032 -> 0 bytes .../apex/com.android.hardware.thermal.pem | 51 ---------------- .../apex/com.android.hardware.thermal.pk8 | Bin 2376 -> 0 bytes .../com.android.hardware.thermal.x509.pem | 34 ----------- thermal/2.0/default/apex/file_contexts | 5 -- thermal/2.0/default/apex/manifest.json | 4 -- 8 files changed, 2 insertions(+), 161 deletions(-) delete mode 100644 thermal/2.0/default/apex/Android.bp delete mode 100644 thermal/2.0/default/apex/com.android.hardware.thermal.avbpubkey delete mode 100644 thermal/2.0/default/apex/com.android.hardware.thermal.pem delete mode 100644 thermal/2.0/default/apex/com.android.hardware.thermal.pk8 delete mode 100644 thermal/2.0/default/apex/com.android.hardware.thermal.x509.pem delete mode 100644 thermal/2.0/default/apex/file_contexts delete mode 100644 thermal/2.0/default/apex/manifest.json diff --git a/thermal/2.0/default/Android.bp b/thermal/2.0/default/Android.bp index f743adef32..83afa97c7b 100644 --- a/thermal/2.0/default/Android.bp +++ b/thermal/2.0/default/Android.bp @@ -22,23 +22,13 @@ package { default_applicable_licenses: ["hardware_interfaces_license"], } -filegroup { - name: "android.hardware.thermal@2.0-service.xml", - srcs: ["android.hardware.thermal@2.0-service.xml"], -} - -filegroup { - name: "android.hardware.thermal@2.0-service.rc", - srcs: ["android.hardware.thermal@2.0-service.rc"], -} - cc_binary { name: "android.hardware.thermal@2.0-service.mock", defaults: ["hidl_defaults"], relative_install_path: "hw", vendor: true, - init_rc: [":android.hardware.thermal@2.0-service.rc"], - vintf_fragments: [":android.hardware.thermal@2.0-service.xml"], + init_rc: ["android.hardware.thermal@2.0-service.rc"], + vintf_fragments: ["android.hardware.thermal@2.0-service.xml"], srcs: [ "Thermal.cpp", "service.cpp", diff --git a/thermal/2.0/default/apex/Android.bp b/thermal/2.0/default/apex/Android.bp deleted file mode 100644 index 914a3a8a97..0000000000 --- a/thermal/2.0/default/apex/Android.bp +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (C) 2022 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package { - default_applicable_licenses: ["hardware_interfaces_license"], -} - -apex_key { - name: "com.android.hardware.thermal.key", - public_key: "com.android.hardware.thermal.avbpubkey", - private_key: "com.android.hardware.thermal.pem", -} - -android_app_certificate { - name: "com.android.hardware.thermal.certificate", - certificate: "com.android.hardware.thermal", -} - -genrule { - name: "com.android.hardware.thermal.rc-gen", - srcs: [":android.hardware.thermal@2.0-service.rc"], - out: ["com.android.hardware.thermal.rc"], - cmd: "sed -E 's/\\/vendor/\\/apex\\/com.android.hardware.thermal.mock/' $(in) > $(out)", -} - -prebuilt_etc { - name: "com.android.hardware.thermal.rc", - src: ":com.android.hardware.thermal.rc-gen", - installable: false, -} - -apex { - name: "com.android.hardware.thermal.mock", - manifest: "manifest.json", - file_contexts: "file_contexts", - key: "com.android.hardware.thermal.key", - certificate: ":com.android.hardware.thermal.certificate", - use_vndk_as_stable: true, - updatable: false, - soc_specific: true, - binaries: ["android.hardware.thermal@2.0-service.mock"], - prebuilts: ["com.android.hardware.thermal.rc"], - vintf_fragments: [":android.hardware.thermal@2.0-service.xml"], -} diff --git a/thermal/2.0/default/apex/com.android.hardware.thermal.avbpubkey b/thermal/2.0/default/apex/com.android.hardware.thermal.avbpubkey deleted file mode 100644 index 8f7cf72760d14321681f46a69b502e809faee507..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 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 diff --git a/thermal/2.0/default/apex/com.android.hardware.thermal.x509.pem b/thermal/2.0/default/apex/com.android.hardware.thermal.x509.pem deleted file mode 100644 index 048e69a25e..0000000000 --- a/thermal/2.0/default/apex/com.android.hardware.thermal.x509.pem +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIF3TCCA8UCFFWeg2KJX/fyAqZPcKaFS61/a3GiMA0GCSqGSIb3DQEBCwUAMIGp -MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91 -bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEi -MCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTElMCMGA1UEAwwcY29t -LmFuZHJvaWQuaGFyZHdhcmUudGhlcm1hbDAgFw0yMTExMTcxODE3MjRaGA80NzU5 -MTAxNDE4MTcyNFowgakxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlh -MRYwFAYDVQQHDA1Nb3VudGFpbiBWaWV3MRAwDgYDVQQKDAdBbmRyb2lkMRAwDgYD -VQQLDAdBbmRyb2lkMSIwIAYJKoZIhvcNAQkBFhNhbmRyb2lkQGFuZHJvaWQuY29t -MSUwIwYDVQQDDBxjb20uYW5kcm9pZC5oYXJkd2FyZS50aGVybWFsMIICIjANBgkq -hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA2W8QhCKX0WoS5jhIWbWBoKulD6XhKASA -CL0oU6Uci0U6id2m++ou/T0aHSlliS9kT1NEABNwbLeTDa9h1qg1lbajRzXbvzEz -EvZYT+dlgYFNZ9zaVCIlMapoiN+nrM/Rs24UBjJrZu1B39+IcE5ciQz69PgrLKWF -vFEdYzxWI246azOVr3fvdelQg+CyPgiGObVAGOHhAidvsjg4FssKnADzn+JNlTt6 -b9P65xUQErut8hz9YdLtfZ096iwe8eEpsMOQwCNdKNXVCcNjQWkOwRaU+0awHoH1 -4mArvF7yyvJxqzkNaR03BPqXAHPIAPu6xdfA19+HVIiz6bLEZ1mfCM6edXByCWZu -K8o54OZph71r15ncv4DVd+cnBjNvBvfdlJSeGjSreFkUo5NkfAwqdmLfZx6CedHI -sLx7X8vPYolQnR4UEvaX6yeNN0gs8Dd6ePMqOEiwWFVASD+cbpcUrp09uzlDStGV -1DPx/9J2kw8eXPMqOSGThkLWuUMUFojyh7bNlL16oYmEeZW6/OOXCOXzAQgJ7NIs -DA1/H2w1HMHWgSfF4y+Es2CiqcgVFOIU/07b31Edw4v56pjx1CUpRpJZjDA1JJNo -A4YCnpA6JWTxzUTmv21fEYyY+poA3CuzvCfZ80z9h/UFW98oM9GawGvK0i2pLudS -RaZXWeil08cCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAj2gpn/IpAHQLDlI52WwL -IDc5uzlf1BGseLZ8M8uuMiwvN00nOjunQQZEIbhH7+03GYyMzRhTTI3nWwmX4Fnq -vC5sR68yNlu9gOAMXaAHo/Rw73ak7sv8xGbb2FeQsHaMKDQ2nqxP17SWdQ0xWa1u -5qNurPOdAPOw77noZcT7yYX7lcrOKxPIekPJxyeOlp4bQSmabSRgYr70B7GybPlv -K1gkgCBxl5RiVjVxLo+7ESHSAaGLy0S7F2v6PJ9oj15TovWQ0py2iBKZ6HReB7s/ -umnQqkwXDLudlNmoXIsgIYn8vKFTYpy1GSNJqhRSLfvLR6NtuU0iCTvg/X7oPmS1 -dWUdjVeO7ZVvIpO3gLLEe4maBEYF2sOlt3bRmzIHydORJtkfTt5tiZ4wR9RfJbkj -iBiDbNiX010bZPTAXmgMbuJzQXZEXCBy0qKeS1cHwf9M8FDoiLajXepfZIp+6syt -D4lZk4eAV141JL5PfABfdZWwT3cTgFIqCYpqrMQJIu+GHEjUwD2yNPi0I1/ydFCW -CPDnzWjYCi6yVB8hss3ZFbvhfyJzdm3LivNVbLGK0+TG0EOAz6d2aQ0UjESgMD1A -U8hLzQt7MiFSG0bt2cVx6SgCHeYUqMntbFELEAURWrhAfPLMJtAvFgKbEiZEAkkW -pdDVh603aIp4LjVCfTYp/mQ= ------END CERTIFICATE----- diff --git a/thermal/2.0/default/apex/file_contexts b/thermal/2.0/default/apex/file_contexts deleted file mode 100644 index e0d87c73a7..0000000000 --- a/thermal/2.0/default/apex/file_contexts +++ /dev/null @@ -1,5 +0,0 @@ -(/.*)? u:object_r:vendor_file:s0 -# Permission XMLs -/etc/permissions(/.*)? u:object_r:vendor_configs_file:s0 -# binary -/bin/hw/android\.hardware\.thermal@2\.0-service\.mock u:object_r:hal_thermal_default_exec:s0 diff --git a/thermal/2.0/default/apex/manifest.json b/thermal/2.0/default/apex/manifest.json deleted file mode 100644 index ee44dc1dbf..0000000000 --- a/thermal/2.0/default/apex/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "com.android.hardware.thermal.mock", - "version": 1 -}