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

Merge "Remove arch-variant from some python properties" am: 0bdaa188e1

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

Change-Id: I4cfc92f22cebbecead5a0a4866e86e187bf494fb
This commit is contained in:
Treehugger Robot
2021-09-22 02:01:16 +00:00
committed by Automerger Merge Worker
parent af59d812d3 0bdaa188e1
commit 364f3baa71
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
python/python.go
View File

@@ -45,7 +45,7 @@ func RegisterPythonPreDepsMutators(ctx android.RegisterMutatorsContext) {
type VersionProperties struct { type VersionProperties struct {
// whether the module is required to be built with this version. // whether the module is required to be built with this version.
// Defaults to true for Python 3, and false otherwise. // Defaults to true for Python 3, and false otherwise.
Enabled *bool `android:"arch_variant"` Enabled *bool
// list of source files specific to this Python version. // list of source files specific to this Python version.
// Using the syntax ":module", srcs may reference the outputs of other modules that produce source files, // Using the syntax ":module", srcs may reference the outputs of other modules that produce source files,
@@ -60,7 +60,7 @@ type VersionProperties struct {
Libs []string `android:"arch_variant"` Libs []string `android:"arch_variant"`
// whether the binary is required to be built with embedded launcher for this version, defaults to false. // whether the binary is required to be built with embedded launcher for this version, defaults to false.
Embedded_launcher *bool `android:"arch_variant"` // TODO(b/174041232): Remove this property Embedded_launcher *bool // TODO(b/174041232): Remove this property
} }
// properties that apply to all python modules // properties that apply to all python modules
@@ -70,10 +70,10 @@ type BaseProperties struct {
// eg. Pkg_path = "a/b/c"; Other packages can reference this module by using // eg. Pkg_path = "a/b/c"; Other packages can reference this module by using
// (from a.b.c import ...) statement. // (from a.b.c import ...) statement.
// if left unspecified, all the source/data files path is unchanged within zip file. // if left unspecified, all the source/data files path is unchanged within zip file.
Pkg_path *string `android:"arch_variant"` Pkg_path *string
// true, if the Python module is used internally, eg, Python std libs. // true, if the Python module is used internally, eg, Python std libs.
Is_internal *bool `android:"arch_variant"` Is_internal *bool
// list of source (.py) files compatible both with Python2 and Python3 used to compile the // list of source (.py) files compatible both with Python2 and Python3 used to compile the
// Python module. // Python module.