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
diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go
index 7b3acb5..263e0a5 100644
--- a/apex/apex_singleton.go
+++ b/apex/apex_singleton.go
@@ -18,6 +18,7 @@
import (
"encoding/json"
+ "strings"
"github.com/google/blueprint"
@@ -94,7 +95,9 @@
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)
+ }
}
}
}