From b7c60a52de69527832f76850d2ed8512483aa598 Mon Sep 17 00:00:00 2001 From: Muhammad Qureshi Date: Fri, 16 Aug 2019 16:32:29 -0700 Subject: [PATCH] Add apex configuration for statsd Bug: 139549262 Test: build, install, and verify statsd module is mounted Change-Id: Iffbb02ffcea00cf6d30da326d441c647522217dc --- apex/statsd/Android.bp | 46 ++++++++++++++++++ apex/statsd/apex_manifest.json | 5 ++ apex/statsd/com.android.os.statsd.avbpubkey | Bin 0 -> 1032 bytes apex/statsd/com.android.os.statsd.pem | 51 ++++++++++++++++++++ apex/statsd/com.android.os.statsd.pk8 | Bin 0 -> 2375 bytes apex/statsd/com.android.os.statsd.x509.pem | 30 ++++++++++++ 6 files changed, 132 insertions(+) create mode 100644 apex/statsd/Android.bp create mode 100644 apex/statsd/apex_manifest.json create mode 100644 apex/statsd/com.android.os.statsd.avbpubkey create mode 100644 apex/statsd/com.android.os.statsd.pem create mode 100644 apex/statsd/com.android.os.statsd.pk8 create mode 100644 apex/statsd/com.android.os.statsd.x509.pem diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp new file mode 100644 index 0000000000000..d76a40e9e26d6 --- /dev/null +++ b/apex/statsd/Android.bp @@ -0,0 +1,46 @@ +// Copyright (C) 2019 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. + +apex { + name: "com.android.os.statsd", + + manifest: "apex_manifest.json", + + // optional. if unspecified, a default one is auto-generated + //androidManifest: "AndroidManifest.xml", + + // libc.so and libcutils.so are included in the apex + // native_shared_libs: ["libc", "libcutils"], + // binaries: ["vold"], + // java_libs: ["core-all"], + // prebuilts: ["my_prebuilt"], + + compile_multilib: "both", + + key: "com.android.os.statsd.key", + certificate: ":com.android.os.statsd.certificate", +} + +apex_key { + name: "com.android.os.statsd.key", + public_key: "com.android.os.statsd.avbpubkey", + private_key: "com.android.os.statsd.pem", +} + +android_app_certificate { + name: "com.android.os.statsd.certificate", + // This will use com.android.os.statsd.x509.pem (the cert) and + // com.android.os.statsd.pk8 (the private key) + certificate: "com.android.os.statsd", +} diff --git a/apex/statsd/apex_manifest.json b/apex/statsd/apex_manifest.json new file mode 100644 index 0000000000000..0c0ad860f3d16 --- /dev/null +++ b/apex/statsd/apex_manifest.json @@ -0,0 +1,5 @@ +{ + "name": "com.android.os.statsd", + "version": 1 +} + diff --git a/apex/statsd/com.android.os.statsd.avbpubkey b/apex/statsd/com.android.os.statsd.avbpubkey new file mode 100644 index 0000000000000000000000000000000000000000..d78af8b8bef2785c260675c87589f99453c6be46 GIT binary patch literal 1032 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 literal 0 HcmV?d00001 diff --git a/apex/statsd/com.android.os.statsd.x509.pem b/apex/statsd/com.android.os.statsd.x509.pem new file mode 100644 index 0000000000000..e7b16b2048cbb --- /dev/null +++ b/apex/statsd/com.android.os.statsd.x509.pem @@ -0,0 +1,30 @@ +-----BEGIN CERTIFICATE----- +MIIFDTCCAvWgAwIBAgIUCnta1LAl5fMMLLQx//4zWz9A2A8wDQYJKoZIhvcNAQEL +BQAwFTETMBEGA1UECgwKR29vZ2xlIExMQzAgFw0xOTA4MTIyMjM5MzBaGA80NzU3 +MDcwODIyMzkzMFowFTETMBEGA1UECgwKR29vZ2xlIExMQzCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAOranWZ19jkXCF9WIlXv01tUUvLKMHWKV7X9Earw +cL7/aax0pFbNJutgyBUiOszbR+0T7quZxz6jACu+6y7iaMJnvMluZsfTi+p2UvQt +y6Ql7ZUOQ7bVluCFIW5hZ+8d9RrLmZdvX1r4YfF6HufDBkAbj+os+y6407OezJAV +8EATpemc9gsCC4RJZpwzTs1RUXMD4UoNrLZAE8+7iaJZeBxmz0MAPj92pYc9M7/d +xInzYvOR08/uEpHt8jlMdVgSQS/FaRlIOIqcGBk3cjkjDlpVATQ4Hyjy+IPQPjTD +bJUmDJiYeBCyY/pYZQvTQjl8s+fvykTsF9Lfb+E+PhZ0+N8pRi7sUSpisZHSiqaN +W3oxYWc0YQSuzygHHog8HH/azHX5L805g/+Rwfb/cUF9eJgjq0vrkFnsz4UKgKNV +hHL90mfqpbc2UvJ8VY8BvIjbsHQ77LrBKlqI9VMPorttpTOuwHHJPKsyN972F0Ul +lRB6CwFE8csVGWXoNaDZWBv7xTDdbdirmlKDNueg9pw6ksYV2Is9Dv8PxmsZvb+4 +oftC/hb4X1Pudn01PPs9Tx44CwHuVLENUwlDEVzG5zNetsv9kAuCYt3VRVF+NYqj +NAfLbxCKLe25wGzJrZUEJ1YrYIjpUbfwnttEad/9Pu13DAS7HZwn5vwqEKB/1LlT +NSUXAgMBAAGjUzBRMB0GA1UdDgQWBBSKElkhJSbzgh8+iysye8SrkmJ62DAfBgNV +HSMEGDAWgBSKElkhJSbzgh8+iysye8SrkmJ62DAPBgNVHRMBAf8EBTADAQH/MA0G +CSqGSIb3DQEBCwUAA4ICAQANFGnc2wJBrFbh2nzhl06g4TjPKGRCw365vZ1A3T9O +jXP0lToHDxB33TpKk6d7zszR1uPphQQxgzhSVZB/jx8q4kWSSoKoF9Dlx7h8rAt+ +2TM5DaBvxrwu5mqOALwQuF81wap1Pl2L2fFHvygCm8b+Ci4iS5vcr0axNnp1rK1b +vUtRWY4mfxTjJYcgeCVUGskqTb+cCxQZ6Icno6VTKajT1FybRmD3KZJaUuLbNEN+ +IE4nGTMG2WZ5Hl2vR8JJp1sYYn8T3ElMAb0MSNFkqsfI+tToEwGsuJDgYEdtEnzf +lTycQvn5NhrIZRRN3pqSyWpAU7p9mmyTK0PHMz2D/Rtfb7lE692vXzxCmZND51mc +YXCCoanV6eZZ7Sbqzh60+5QV38hgFBst5l8CcFaWWSFK9nBWdzS5lhs9lmQ4aiYd +IE0qsNZgMob+TTP1VW39hu4EDjNmOrKfimM9J2tcPZ5QP01DgETPvAsB7vn2Xz9J +HGt5ntiSV4W2izDP8viQ1M5NvfdBaUhcnNsE6/sxfU0USRs2hrEp1oiqrv4p6V0P +qOt7C2/YtJzkrxfsHZAxBUSRHa7LwtzgeiJDUivHn94VnAzSAH8MLx6CzDPQ8HWN +NiZFxTKfMVyjEmbQ2PalHWB8pWtpdEh7X4rzaqhnLBTis3pGssASgo3ArLIYleAU ++g== +-----END CERTIFICATE-----