From 190a66abb243f22995d46e6dd90808f4d69eeeeb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 5 Dec 2024 14:06:17 -0800 Subject: Move parent static check in cc.Module.DepIsInSameApex into tag In order to prepare for splitting DepIsInSameApex so it can be called separately on the outgoing and incoming modules during a transtion, add fromStatic to libraryDependencyTag so that the check doesn't need to access both the parent and the child module. This also fixes cases where the static parent was misdetected, which causes a single test failure that seems correct, TestApexWithTests. cc.Module.DepIsInSameApex correctly identifies that the "mytest" module is static and the "mylib" shared library dependency is not used in the apex. Fix the test to make "mytest" non-static so that "mylib" is included. Bug: 372543712 Test: all Soong tests pass Change-Id: Ibb0cfff77adefb804ff6c66467ac761b723597de --- apex/apex_test.go | 1 - 1 file changed, 1 deletion(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 282cd1dd3..5cd0541b9 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -5818,7 +5818,6 @@ func TestApexWithTests(t *testing.T) { relative_install_path: "test", shared_libs: ["mylib"], system_shared_libs: [], - static_executable: true, stl: "none", data: [":fg"], } -- cgit v1.2.3-59-g8ed1b