aboutsummaryrefslogtreecommitdiff
path: root/python/python.go
diff options
context:
space:
mode:
authormosimchah <mosimchah@gmail.com>2025-12-02 09:27:38 -0500
committermosimchah <mosimchah@gmail.com>2025-12-02 09:27:38 -0500
commitc7bade461dc55726f62997d13a48582f7c4b4655 (patch)
treeea0588da76060a2038f54f67efd046ca77634b10 /python/python.go
parent0f5414d19317805e8bbbe7c4db5f0fd78769bad5 (diff)
parent89d78cff8b00d3b20a90074635c3fe5a2ee49474 (diff)
Merge branch 'lineage-23.1' of https://github.com/LineageOS/android_build_soong into HEADw16.1
* 'lineage-23.1' of https://github.com/LineageOS/android_build_soong: (528 commits) Revert "install_symlink: Make symlink target configurable" Reapply "Clear as much of cc.Module as possible after GenerateBuildActions" Revert "rust: config: Fix missing CPU variant LD flags in Rust" Rename build-flag in outdir Revert^4 "cipd: Default CIPD proxy server to on, add opt-out" Convert check-vintf-all to phony with actions Create a partial implementation of check-vintf-all for soong-only Configure RBE rust pool based on build variant Revert^3 "Add sdk version check to arr" Add jdk.internal.invoke to the allowlist Make droid always depend on symbols zip Import Device and Odm skus Don't install gob_gen in Soong Remove bazel reference from run_integration_tests.sh Fix bootstrap_test.sh Don't panic in aconfig libraries when AllowMissingDependencies is set Avoid returning nil paths from PathForModuleSrc Revert "Flag controled clang version" Rework module target dependencies on required deps Revert^2 "Add sdk version check to arr" ... Change-Id: I6e9a63fa14fda917a42e426e5dcebbad7f67e1de
Diffstat (limited to 'python/python.go')
-rw-r--r--python/python.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/python/python.go b/python/python.go
index de21e39bd..7af8d9d18 100644
--- a/python/python.go
+++ b/python/python.go
@@ -108,7 +108,6 @@ type BaseProperties struct {
// list of the Python libraries compatible both with Python2 and Python3.
Libs []string `android:"arch_variant"`
- // TODO: b/403060602 - add unit tests for this property and related code
// list of shared libraries that should be packaged with the python code for this module.
Shared_libs []string `android:"arch_variant"`
@@ -681,7 +680,7 @@ func (p *PythonLibraryModule) collectPathsFromTransitiveDeps(ctx android.ModuleC
destToPyData[path.dest] = path.src.String()
}
- seen := make(map[android.Module]bool)
+ seen := make(map[android.ModuleProxy]bool)
var result android.Paths
@@ -727,7 +726,7 @@ func (p *PythonLibraryModule) collectPathsFromTransitiveDeps(ctx android.ModuleC
}
func (p *PythonLibraryModule) collectSharedLibDeps(ctx android.ModuleContext) android.Paths {
- seen := make(map[android.Module]bool)
+ seen := make(map[android.ModuleProxy]bool)
var result android.Paths