From 054897952213f87d40a901ed8546ce6375c93347 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Thu, 20 Apr 2023 10:16:14 +0900 Subject: Remove deps from Soong intermediate to symbols These should be handled by Makefile dependency (LOCAL_REQUIRED_MODULES). Bug: 278832320 Test: build and see symbol files (cherry picked from https://android-review.googlesource.com/q/commit:5bedfee4484a8786ccd761212057f8aac9a02eb7) Merged-In: I80ad9d8e7e8384e2ae3537cc681bc1d1b327d04c Change-Id: I80ad9d8e7e8384e2ae3537cc681bc1d1b327d04c --- apex/apex_test.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'apex/apex_test.go') diff --git a/apex/apex_test.go b/apex/apex_test.go index 4e063cb73..440afec97 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -5716,6 +5716,7 @@ func TestPrebuiltSkipsSymbols(t *testing.T) { // Source module apex { name: "myapex", + binaries: ["foo"], key: "myapex.key", updatable: false, } @@ -5731,11 +5732,19 @@ func TestPrebuiltSkipsSymbols(t *testing.T) { set: "myapex.apks", `+preferProperty+` } + + cc_binary { + name: "foo", + srcs: ["mylib.cpp"], + system_shared_libs: [], + stl: "none", + apex_available: [ "myapex" ], + } `) // Symbol files are installed by installing entries under ${OUT}/apex/{apex name} - android.AssertStringListContainsEquals(t, "Implicits", - ctx.ModuleForTests("myapex", "android_common_myapex_image").Rule("apexRule").Implicits.Strings(), - "out/soong/target/product/test_device/apex/myapex/apex_manifest.pb", + android.AssertStringListContainsEquals(t, "Installs", + ctx.ModuleForTests("myapex", "android_common_myapex_image").Module().FilesToInstall().Strings(), + filepath.Join(ctx.Config().SoongOutDir(), "target/product/test_device/apex/myapex/bin/foo"), tc.installSymbolFiles) }) } -- cgit v1.2.3-59-g8ed1b