From 8aee204cb29e40bef8286ee4c792e0bd8b85f654 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 29 Oct 2019 05:08:31 +0900 Subject: [PATCH] Do not follow deps for apex_vndk Since apex_vndk deals with its own dependencies, it should not follow dependencies while packaging. Bug: 139772411 Test: TARGET_VNDK_USE_CORE_VARIANT=true m com.android.vndk.current see if there are unexpected libs in the apex for example, android.hardware.audio.common@2.0.so should not be included in the apex since it is not listed as "must use vendor variant". Change-Id: Ibada600b3099fb19630d1e327a2e09cd26b2deb0 --- apex/apex.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apex/apex.go b/apex/apex.go index 75da7da25..4ad268060 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1176,7 +1176,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { ctx.PropertyErrorf("apps", "%q is not an android_app module", depName) } } - } else { + } else if !a.vndkApex { // indirect dependencies if am, ok := child.(android.ApexModule); ok { // We cannot use a switch statement on `depTag` here as the checked