StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add preparers for python" am: f49f72f271 am: dca128e44a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1643943

Change-Id: I67128d1e938020770d60b3dff7c669a9d7864507
This commit is contained in:
Paul Duffin
2021-03-18 09:13:07 +00:00
committed by Automerger Merge Worker
parent f3c3e60623 dca128e44a
commit b7200fc522
6 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
python/Android.bp
View File

@@ -20,6 +20,7 @@ bootstrap_go_package {
"proto.go", "proto.go",
"python.go", "python.go",
"test.go", "test.go",
"testing.go",
], ],
testSrcs: [ testSrcs: [
"python_test.go", "python_test.go",

6
python/binary.go
View File

@@ -26,10 +26,14 @@ import (
) )
func init() { func init() {
android.RegisterModuleType("python_binary_host", PythonBinaryHostFactory) registerPythonBinaryComponents(android.InitRegistrationContext)
android.RegisterBp2BuildMutator("python_binary_host", PythonBinaryBp2Build) android.RegisterBp2BuildMutator("python_binary_host", PythonBinaryBp2Build)
} }
func registerPythonBinaryComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("python_binary_host", PythonBinaryHostFactory)
}
type bazelPythonBinaryAttributes struct { type bazelPythonBinaryAttributes struct {
Main string Main string
Srcs bazel.LabelList Srcs bazel.LabelList

8
python/library.go
View File

@@ -21,8 +21,12 @@ import (
) )
func init() { func init() {
android.RegisterModuleType("python_library_host", PythonLibraryHostFactory) registerPythonLibraryComponents(android.InitRegistrationContext)
android.RegisterModuleType("python_library", PythonLibraryFactory) }
func registerPythonLibraryComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("python_library_host", PythonLibraryHostFactory)
ctx.RegisterModuleType("python_library", PythonLibraryFactory)
} }
func PythonLibraryHostFactory() android.Module { func PythonLibraryHostFactory() android.Module {

6
python/python.go
View File

@@ -29,7 +29,11 @@ import (
) )
func init() { func init() {
android.PreDepsMutators(RegisterPythonPreDepsMutators) registerPythonMutators(android.InitRegistrationContext)
}
func registerPythonMutators(ctx android.RegistrationContext) {
ctx.PreDepsMutators(RegisterPythonPreDepsMutators)
} }
// Exported to support other packages using Python modules in tests. // Exported to support other packages using Python modules in tests.

8
python/test.go
View File

@@ -22,8 +22,12 @@ import (
// This file contains the module types for building Python test. // This file contains the module types for building Python test.
func init() { func init() {
android.RegisterModuleType("python_test_host", PythonTestHostFactory) registerPythonTestComponents(android.InitRegistrationContext)
android.RegisterModuleType("python_test", PythonTestFactory) }
func registerPythonTestComponents(ctx android.RegistrationContext) {
ctx.RegisterModuleType("python_test_host", PythonTestHostFactory)
ctx.RegisterModuleType("python_test", PythonTestFactory)
} }
// Test option struct. // Test option struct.

24
python/testing.go Normal file
View File

@@ -0,0 +1,24 @@
// Copyright 2021 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 python
import "android/soong/android"
var PrepareForTestWithPythonBuildComponents = android.GroupFixturePreparers(
android.FixtureRegisterWithContext(registerPythonBinaryComponents),
android.FixtureRegisterWithContext(registerPythonLibraryComponents),
android.FixtureRegisterWithContext(registerPythonTestComponents),
android.FixtureRegisterWithContext(registerPythonMutators),
)