diff options
author | Steven Terrell <steventerrell@google.com> | 2023-12-20 21:39:39 +0000 |
---|---|---|
committer | Steven Terrell <steventerrell@google.com> | 2023-12-20 23:35:44 +0000 |
commit | 48a950b46d3ff05b6d8bcb03a53ba088e13d75dd (patch) | |
tree | e7b20abca60c77da1524f0cf7500bc96475b6ed2 | |
parent | bd6cdb738f317bd75335fe4551a576431beebff4 (diff) | |
download | Profiling-48a950b46d3ff05b6d8bcb03a53ba088e13d75dd.tar.gz |
Revert^2 "create apex skeleton"simpleperf-release
This reverts commit bd6cdb738f317bd75335fe4551a576431beebff4, and adds
the 'min_sdk_version' to the Android.bp file.
Reason for revert: The original reason for the revert was by adding a V
only module it caused build failures on some U specific branches.
Adding the min_sdk_version tag should resolve the issue.
Bug: 316423066
Test: Manual.
Change-Id: I30152b89f97ebc2cc40e62acc3000f7adfb85a4b
-rw-r--r-- | apex/Android.bp | 38 | ||||
-rw-r--r-- | apex/com.android.profiling.avbpubkey | bin | 0 -> 1032 bytes | |||
-rw-r--r-- | apex/com.android.profiling.pem | 52 | ||||
-rw-r--r-- | apex/com.android.profiling.pk8 | bin | 0 -> 2375 bytes | |||
-rw-r--r-- | apex/com.android.profiling.x509.pem | 34 | ||||
-rw-r--r-- | apex/manifest.json | 7 |
6 files changed, 131 insertions, 0 deletions
diff --git a/apex/Android.bp b/apex/Android.bp new file mode 100644 index 0000000..a36bd8d --- /dev/null +++ b/apex/Android.bp @@ -0,0 +1,38 @@ +// Copyright (C) 2023 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: ["Android-Apache-2.0"], +} + +apex_key { + name: "com.android.profiling.key", + public_key: "com.android.profiling.avbpubkey", + private_key: "com.android.profiling.pem", +} + +android_app_certificate { + name: "com.android.profiling.certificate", + certificate: "com.android.profiling", +} + +apex { + name: "com.android.profiling", + manifest: "manifest.json", + file_contexts: ":apex.test-file_contexts", + key: "com.android.profiling.key", + certificate: ":com.android.profiling.certificate", + defaults: ["v-launched-apex-module"], + min_sdk_version: "34", +} diff --git a/apex/com.android.profiling.avbpubkey b/apex/com.android.profiling.avbpubkey Binary files differnew file mode 100644 index 0000000..aba0c24 --- /dev/null +++ b/apex/com.android.profiling.avbpubkey diff --git a/apex/com.android.profiling.pem b/apex/com.android.profiling.pem new file mode 100644 index 0000000..4b51b05 --- /dev/null +++ b/apex/com.android.profiling.pem @@ -0,0 +1,52 @@ +-----BEGIN PRIVATE KEY----- +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 +9QjpoxOm3RxUURsBXIlwDZVKVc2VWg== +-----END PRIVATE KEY----- diff --git a/apex/com.android.profiling.pk8 b/apex/com.android.profiling.pk8 Binary files differnew file mode 100644 index 0000000..9141193 --- /dev/null +++ b/apex/com.android.profiling.pk8 diff --git a/apex/com.android.profiling.x509.pem b/apex/com.android.profiling.x509.pem new file mode 100644 index 0000000..6598ec9 --- /dev/null +++ b/apex/com.android.profiling.x509.pem @@ -0,0 +1,34 @@ +-----BEGIN CERTIFICATE----- +MIIFzzCCA7cCFDQvqup1pAX4jBkB/CdSuxtevwf/MA0GCSqGSIb3DQEBCwUAMIGi +MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNTW91 +bnRhaW4gVmlldzEQMA4GA1UECgwHQW5kcm9pZDEQMA4GA1UECwwHQW5kcm9pZDEi +MCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTEeMBwGA1UEAwwVY29t +LmFuZHJvaWQucHJvZmlsaW5nMCAXDTIzMTIxNTAwMjMzMVoYDzQ3NjExMTEwMDAy +MzMxWjCBojELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNV +BAcMDU1vdW50YWluIFZpZXcxEDAOBgNVBAoMB0FuZHJvaWQxEDAOBgNVBAsMB0Fu +ZHJvaWQxIjAgBgkqhkiG9w0BCQEWE2FuZHJvaWRAYW5kcm9pZC5jb20xHjAcBgNV +BAMMFWNvbS5hbmRyb2lkLnByb2ZpbGluZzCCAiIwDQYJKoZIhvcNAQEBBQADggIP +ADCCAgoCggIBANpSrJDtjvl2G/jR4tcxn4xDbiFd7ZYk9zhzDQk4pqZKq4JCavpx +ySTbMvYpWIW5LXgRp+6P8HeGxEW0FrON09opJKFY4/t3FFjdBdsE+ZLICDPrTTQp +E5BaExFScsjvgqegQ6v8WN/dP3UyqHB2fkeY/JGRNOtBvLluzfK3oG4QR1Rk1hnQ +1e6nHVZ3KUiGddI3D471matcVWEEkSvkm7YWJi/3JhIDO3FTQ0w4dZoTZ3KaPW85 +acYfHpgY713OIXhpdU8MHQyCSu2GW9eDAkzIzglYmZytraAgAlpG80uD8wn2hH5e +F7YxV/GcLPLnN37vyvaq0XfXsbC+td0tWKKGcBj5psAEVSXU7ch7KLFrVzQd/Cjk +C/YcItCjhP4wLRc0L13aGyYMEQu0XttBK5SeQeLN8wqJdrKQ3hzM1uyptonFXDg/ +G1TtKNIL9gkXKL3GzO1b+ufGvN9xre8t1XrpkdBkAOPZko+ynuPixdHA02Gaqfrw +LVlVLhibJ1mrjOP4DKdTiL/9ooWMR52y0c0Kjnal1aLo6Mcw2EPL9sbECnF1dQCX +ozXeVQ9nxsm1NaJDOL1uakDNCnMqdCaLO0EE0Hrn4Ot8xA3SK5mpi2t5FAOr9BtN +lijyeCJnwFxI5E4ktwyfKe861hE43KXGrF+UeKOcbDMX7nhs7vmcFff5AgMBAAEw +DQYJKoZIhvcNAQELBQADggIBAMCiXc/95goVMr5wB5L9KAdXGma6FIKmAgpn4eBt +N7pVCIVoVPzyZZK+fBFFQz1D/WmZbMl4KwB9DXBhUQTVOO8kCjTZwuZcVN09zv0X +hXBtcgMB6J+ISMwfVpiaRMeJFDyj5lVEw4YSEPyhSgV4ESdOkLyaHa6e+HUnVx7j +BPasjIHtBc69vkpSPj6Jvb3n4+dIcxy5Sb7vF+pcWrOQgiNXcYVlbBszra7MFcmJ +uzPduSVlZ+EB8Tu1PeMz/TVCdTRbXoxdYJz4gbaZ02lDfGVKSD66/v2z07zUFKnG +/avjn9CvAerhlqRR7oYbTgpjDcoPH18MZDCKVzJZkyRM2M0BrTipNmGbLjZy7lzx +eRc7EA/is1Au3WsyJmodVajsd6PnL0a2c+qHXPFIg/HHcBNMLGWoYNcfFaLj/ZHV +MSIOl46lZk9kNLKXSgyiGIJG+yM0gzMlJJa9ij0+zLg/+fdfUJwKuvDrXYZu2fo2 +iVIv4q+LWSguYHQojVmzKiYE1pd5UWiRmA7iJrQvcQXmYiobh7ibpOMfsOXYLG5M +O6s1rD1eAtIjRwBC54hzFkB5qQWtNCrNiYMX2dsrQ/1jH8GGlJFE+TGZRFIonn5b +JNRU/T4yrVJKGSlKt++SMqye3amKQml5Ye44e4dg3QlxC0yF91OTsYLsPAKiOtqB +7AZ8 +-----END CERTIFICATE----- diff --git a/apex/manifest.json b/apex/manifest.json new file mode 100644 index 0000000..918d0aa --- /dev/null +++ b/apex/manifest.json @@ -0,0 +1,7 @@ +{ + "name": "com.android.profiling", + + // Placeholder module version to be replaced during build. + // Do not change! + "version": 0 +} |