commit 939ebd5f332b243f2921d26f16922cfa8750d862
author Jaewoong Jung <jungjw@google.com> Tue Mar 26 15:07:36 2019 -0700
committer Jaewoong Jung <jungjw@google.com> Thu Mar 28 15:56:22 2019 -0700
tree eede38b9a5600ed2ca0d66180321f3f3c17298a2
parent ac7f27eab0ca0574f14875416fa471137c8736f2

Add prebuilt_apex.

Bug: 127789981
Test: apex_test.go + com.android.tzdata.apex
Change-Id: I09bb0a4b2acf310c55c789569da3c9d755638232

apex/key.go

diff --git a/apex/key.go b/apex/key.go
index 848e8ce..fbd29bc 100644
--- a/apex/key.go
+++ b/apex/key.go
@@ -93,7 +93,7 @@
 	pubKeyName := m.public_key_file.Base()[0 : len(m.public_key_file.Base())-len(m.public_key_file.Ext())]
 	privKeyName := m.private_key_file.Base()[0 : len(m.private_key_file.Base())-len(m.private_key_file.Ext())]
 
-	if pubKeyName != privKeyName {
+	if m.properties.Public_key != nil && m.properties.Private_key != nil && pubKeyName != privKeyName {
 		ctx.ModuleErrorf("public_key %q (keyname:%q) and private_key %q (keyname:%q) do not have same keyname",
 			m.public_key_file.String(), pubKeyName, m.private_key_file, privKeyName)
 		return