From d8e3215efadc83a792f2350225995bb9a7e6b3d4 Mon Sep 17 00:00:00 2001 From: Terry Wang Date: Wed, 20 Nov 2019 16:48:48 -0800 Subject: [PATCH] Add apex structure and sign keys to appsearch. This change adds image and container signing keys. please see go/android-apex-howto for detail. Bug: 144874026 Test: manual Change-Id: I6949043ae360bab44af34f12876721e7940c4338 --- apex/appsearch/Android.bp | 35 ++++++++++++ apex/appsearch/apex_manifest.json | 4 ++ .../appsearch/com.android.appsearch.avbpubkey | Bin 0 -> 1032 bytes apex/appsearch/com.android.appsearch.pem | 51 ++++++++++++++++++ apex/appsearch/com.android.appsearch.pk8 | Bin 0 -> 2373 bytes apex/appsearch/com.android.appsearch.x509.pem | 35 ++++++++++++ 6 files changed, 125 insertions(+) create mode 100644 apex/appsearch/Android.bp create mode 100644 apex/appsearch/apex_manifest.json create mode 100644 apex/appsearch/com.android.appsearch.avbpubkey create mode 100644 apex/appsearch/com.android.appsearch.pem create mode 100644 apex/appsearch/com.android.appsearch.pk8 create mode 100644 apex/appsearch/com.android.appsearch.x509.pem diff --git a/apex/appsearch/Android.bp b/apex/appsearch/Android.bp new file mode 100644 index 0000000000000..bcdcc7da80705 --- /dev/null +++ b/apex/appsearch/Android.bp @@ -0,0 +1,35 @@ +// 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.appsearch", + + manifest: "apex_manifest.json", + + key: "com.android.appsearch.key", + certificate: ":com.android.appsearch.certificate", +} + +apex_key { + name: "com.android.appsearch.key", + public_key: "com.android.appsearch.avbpubkey", + private_key: "com.android.appsearch.pem", +} + +android_app_certificate { + name: "com.android.appsearch.certificate", + // This will use com.android.appsearch.x509.pem (the cert) and + // com.android.appsearch.pk8 (the private key) + certificate: "com.android.appsearch", +} diff --git a/apex/appsearch/apex_manifest.json b/apex/appsearch/apex_manifest.json new file mode 100644 index 0000000000000..273b867e8f982 --- /dev/null +++ b/apex/appsearch/apex_manifest.json @@ -0,0 +1,4 @@ +{ + "name": "com.android.appsearch", + "version": 1 +} diff --git a/apex/appsearch/com.android.appsearch.avbpubkey b/apex/appsearch/com.android.appsearch.avbpubkey new file mode 100644 index 0000000000000000000000000000000000000000..4e5acae9c1e4db9246388b7d0caf3210dfce212d GIT binary patch literal 1032 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