From 13f027147838fd099ffde698a0b24819337b9c88 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 6 Mar 2020 12:30:43 +0000 Subject: Copy shared_libs and system_shared_libs to module snapshot This change ensures that the runtime dependencies between a binary/shared library are correctly specified in the snapshot so that the build can ensure that shared libraries are built before the targets that use them. It adds support for differentiating between references that are required to refer to another sdk member (required) and those that may refer to either an sdk member or a non-sdk member (optional). The latter is used for shared library references as the libraries used by an sdk member may be provided from outside the sdk. e.g. liblog is not part of the ART module but is used by some members of the ART sdk. Bug: 142935992 Test: m nothing Change-Id: Ia8509ffe79b208c23beba1880fe9c8a92b732685 --- java/system_modules.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/system_modules.go') diff --git a/java/system_modules.go b/java/system_modules.go index 47de6e327..40031cb05 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -255,5 +255,5 @@ func (mt *systemModulesSdkMemberType) BuildSnapshot(sdkModuleContext android.Mod pbm := builder.AddPrebuiltModule(member, "java_system_modules_import") // Add the references to the libraries that form the system module. - pbm.AddPropertyWithTag("libs", systemModule.properties.Libs, builder.SdkMemberReferencePropertyTag()) + pbm.AddPropertyWithTag("libs", systemModule.properties.Libs, builder.SdkMemberReferencePropertyTag(true)) } -- cgit v1.2.3-59-g8ed1b