From 7f9b6fbeece0867c8f027fb5cafafab25cc4f5c6 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 19 Apr 2018 15:26:10 -0700 Subject: Export lists of support libraries modules to Make Make will use the list to sort support libraries into LOCAL_STATIC_ANDROID_LIBRARIES and LOCAL_STATIC_JAVA_LIBRARIES as appropriate. Bug: 78300023 Test: m checkbuild Change-Id: I58582b124f2b6a9b124683ddf8f5d77314f2e941 Merged-In: I58582b124f2b6a9b124683ddf8f5d77314f2e941 (cherry picked from commit ff8ab0745f59c9c1ec3268051e24956ba8647849) --- Android.bp | 1 + java/support_libraries.go | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 java/support_libraries.go diff --git a/Android.bp b/Android.bp index 68640fba..e9b1ebe0 100644 --- a/Android.bp +++ b/Android.bp @@ -232,6 +232,7 @@ bootstrap_go_package { "java/java.go", "java/java_resources.go", "java/proto.go", + "java/support_libraries.go", "java/system_modules.go", ], testSrcs: [ diff --git a/java/support_libraries.go b/java/support_libraries.go new file mode 100644 index 00000000..320afae1 --- /dev/null +++ b/java/support_libraries.go @@ -0,0 +1,66 @@ +// Copyright 2018 Google Inc. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package java + +import ( + "sort" + "strings" + + "android/soong/android" +) + +func init() { + android.RegisterMakeVarsProvider(pctx, supportLibrariesMakeVarsProvider) +} + +func supportLibrariesMakeVarsProvider(ctx android.MakeVarsContext) { + var supportAars, supportJars []string + + sctx := ctx.SingletonContext() + sctx.VisitAllModules(func(module android.Module) { + dir := sctx.ModuleDir(module) + switch { + case strings.HasPrefix(dir, "prebuilts/sdk/current/extras"), + dir == "prebuilts/sdk/current/androidx", + dir == "prebuilts/sdk/current/car", + dir == "prebuilts/sdk/current/optional", + dir == "prebuilts/sdk/current/support": + // Support library + default: + // Not a support library + return + } + + name := sctx.ModuleName(module) + if strings.HasSuffix(name, "-nodeps") { + return + } + + switch module.(type) { + case *AndroidLibrary, *AARImport: + supportAars = append(supportAars, name) + case *Library, *Import: + supportJars = append(supportJars, name) + default: + sctx.ModuleErrorf(module, "unknown module type %t", module) + } + }) + + sort.Strings(supportAars) + sort.Strings(supportJars) + + ctx.Strict("SUPPORT_LIBRARIES_AARS", strings.Join(supportAars, " ")) + ctx.Strict("SUPPORT_LIBRARIES_JARS", strings.Join(supportJars, " ")) +} -- cgit v1.2.3