From a720811c3813afb192ed69be0c38fac837514698 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 23 Apr 2021 21:20:20 +0100 Subject: Allow exporting of sdk members to be done per tag Previously, every module added to an sdk directly through one of the SdkMemberType specific properties, e.g. java_libs, was exported and every module added automatically via a transitive dependencies was not exported. This change allows that behavior to be customized per tag. Bug: 186290299 Test: m art-module-sdk - verify that this change does not affect its contents. Change-Id: I563b5bcd823e61c23cdb706cfcbb13337963d550 --- java/system_modules.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'java/system_modules.go') diff --git a/java/system_modules.go b/java/system_modules.go index 320a2bbbf..a09778cd0 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -77,8 +77,9 @@ var ( "classpath", "outDir", "workDir") // Dependency tag that causes the added dependencies to be added as java_header_libs - // to the sdk/module_exports/snapshot. - systemModulesLibsTag = android.DependencyTagForSdkMemberType(javaHeaderLibsSdkMemberType) + // to the sdk/module_exports/snapshot. Dependencies that are added automatically via this tag are + // not automatically exported. + systemModulesLibsTag = android.DependencyTagForSdkMemberType(javaHeaderLibsSdkMemberType, false) ) func TransformJarsToSystemModules(ctx android.ModuleContext, jars android.Paths) (android.Path, android.Paths) { -- cgit v1.2.3-59-g8ed1b