Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
build
Commits
b49d05e7
Commit
b49d05e7
authored
9 years ago
by
Tao Bao
Committed by
Gerrit Code Review
9 years ago
Browse files
Options
Download
Plain Diff
Merge "Makefile: Add the payload public key into system image."
parents
8edda3af
38812d68
master
brillo-m10-dev
brillo-m10-release
nougat-cts-release
nougat-dev
nougat-dr1-release
nougat-mr0.5-release
nougat-mr0.6-release
nougat-mr1-dev
nougat-mr1-release
nougat-mr1.1-release
nougat-mr1.2-release
nougat-release
sdk-release
android-wear-n-preview-2
android-wear-n-preview-1
android-n-preview-5
android-n-preview-4
android-n-preview-3
android-n-preview-2
android-n-preview-1
android-n-mr1-preview-2
android-n-mr1-preview-1
android-cts-7.1_r1
android-cts-7.0_r5
android-cts-7.0_r4
android-cts-7.0_r3
android-cts-7.0_r2
android-cts-7.0_r1
android-7.1.1_r13
android-7.1.1_r12
android-7.1.1_r11
android-7.1.1_r10
android-7.1.1_r9
android-7.1.1_r8
android-7.1.1_r7
android-7.1.1_r6
android-7.1.1_r4
android-7.1.1_r3
android-7.1.1_r2
android-7.1.1_r1
android-7.1.0_r7
android-7.1.0_r6
android-7.1.0_r5
android-7.1.0_r4
android-7.1.0_r3
android-7.1.0_r2
android-7.1.0_r1
android-7.0.0_r27
android-7.0.0_r24
android-7.0.0_r21
android-7.0.0_r19
android-7.0.0_r17
android-7.0.0_r15
android-7.0.0_r14
android-7.0.0_r13
android-7.0.0_r12
android-7.0.0_r7
android-7.0.0_r6
android-7.0.0_r5
android-7.0.0_r4
android-7.0.0_r3
android-7.0.0_r1
afw-test-harness-2.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
0 deletions
+13
-0
core/Makefile
core/Makefile
+13
-0
No files found.
core/Makefile
View file @
b49d05e7
...
...
@@ -695,6 +695,19 @@ $(TARGET_OUT_ETC)/security/otacerts.zip: $(addsuffix .x509.pem,$(DEFAULT_KEY_CER
$(hide)
zip
-qjX
$@
$<
$
(
remove-timestamps-from-package
)
# Carry the public key for update_engine if it's a non-Brillo target that
# uses the AB updater. We use the same key as otacerts but in RSA public key
# format.
ifeq
($(AB_OTA_UPDATER),true)
ifeq
($(BRILLO),)
ALL_DEFAULT_INSTALLED_MODULES
+=
$(TARGET_OUT_ETC)
/security/update_engine/update-payload-key.pub.pem
$(TARGET_OUT_ETC)/security/update_engine/update-payload-key.pub.pem
:
$(addsuffix .x509.pem
,
$(DEFAULT_KEY_CERT_PAIR))
$(hide)
rm
-f
$@
$(hide)
mkdir
-p
$(
dir
$@
)
$(hide)
openssl x509
-pubkey
-noout
-in
$<
>
$@
endif
endif
.PHONY
:
otacerts
otacerts
:
$(TARGET_OUT_ETC)/security/otacerts.zip
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment