From 54956a6ed9fe5e441fb0e6c966080872c3fd1d81 Mon Sep 17 00:00:00 2001 From: Chan Wang Date: Tue, 14 Jan 2025 18:04:39 +0000 Subject: Resend aosp/3445142 Not revert^2 to avoid potential automerge issue, because the previous change failed to auto-merge into internal branch (b/389693264 logged for it) Bug: 380222284 Test: m nothing --no-skip-soong-tests Change-Id: Ie55e98597cb931a4e3e84ae595317f3cc21192c9 --- apex/apex_singleton.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'apex/apex_singleton.go') diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go index 7b3acb509..263e0a52c 100644 --- a/apex/apex_singleton.go +++ b/apex/apex_singleton.go @@ -18,6 +18,7 @@ package apex import ( "encoding/json" + "strings" "github.com/google/blueprint" @@ -94,7 +95,9 @@ func (s *apexDepsInfoSingleton) GenerateBuildActions(ctx android.SingletonContex apexInfo, _ := android.OtherModuleProvider(ctx, module, android.ApexInfoProvider) if path := binaryInfo.FlatListPath(); path != nil { if binaryInfo.Updatable() || apexInfo.Updatable { - updatableFlatLists = append(updatableFlatLists, path) + if strings.HasPrefix(module.String(), "com.android.") { + updatableFlatLists = append(updatableFlatLists, path) + } } } } -- cgit v1.2.3-59-g8ed1b