commit 27151d93b6425ba2e9260e41193458e2d3ec22d9
author Jooyung Han <jooyung@google.com> Mon Dec 16 17:45:32 2019 +0900
committer Jooyung Han <jooyung@google.com> Tue Dec 17 15:22:21 2019 +0000
tree 05a8b89a146b504ad3f81bf2786f33a19177fc32
parent 7cf4b5de6b2d754e48aadeeeec0dc01b26264ee0

Override package name for VNDK APEX

com.android.vndk.v<VER> is overridden with
com.google.android.vndk.v<VERE>.

Test: m com.android.vndk.current
    && aapt2 dump badging ../system/apex/com.android.vndk.current.apex
Change-Id: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
Merged-In: I623d7a144418d7198f0bbf09c5dc983ed1a631c6
(cherry picked from commit 0ed1b1b1695b0f8ad75bd2493aef9f2801407f1c)

apex/vndk.go

diff --git a/apex/vndk.go b/apex/vndk.go
index 15f7f87..43fcfcd 100644
--- a/apex/vndk.go
+++ b/apex/vndk.go
@@ -26,7 +26,8 @@
 )
 
 const (
-	vndkApexNamePrefix = "com.android.vndk.v"
+	vndkApexName       = "com.android.vndk"
+	vndkApexNamePrefix = vndkApexName + ".v"
 )
 
 // apex_vndk creates a special variant of apex modules which contains only VNDK libraries.