diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2024-02-08 13:26:43 +0900 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2024-02-20 00:37:53 +0000 |
| commit | 28c97bc5a531f583a81ce40324fe2e1477d8478c (patch) | |
| tree | a34c6c8392e67acfc65ac6bcb6dd6cf524b5280b /apex | |
| parent | a4ccd0358c8084d69be0261c351b8998507d100e (diff) | |
Do not allow to link libbinder from Vendor APEX
Libbinder was temporarily allowed to be linked from Vendor APEXes before
all other modules are ready to use libbinder_ndk instead. This should be
removed before VNDK deprecation.
Bug: 301378087
Test: Husky build and boot succeeded
Ignore-AOSP-First: Build fix required from plus aosp branch
Change-Id: Id32868489a1a5dd0337aa6bdb773d93bc4e5a921
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/apex.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apex/apex.go b/apex/apex.go index 557b9b74c..d181fe705 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -18,7 +18,6 @@ package apex import ( "fmt" - "log" "path/filepath" "regexp" "sort" @@ -1002,10 +1001,8 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) { } } - //TODO: b/296491928 Vendor APEX should use libbinder.ndk instead of libbinder once VNDK is fully deprecated. if useVndk && mctx.Config().IsVndkDeprecated() && child.Name() == "libbinder" { - log.Print("Libbinder is linked from Vendor APEX ", a.Name(), " with module ", parent.Name()) - return false + mctx.ModuleErrorf("Module %s in the vendor APEX %s should not use libbinder. Use libbinder_ndk instead.", parent.Name(), a.Name()) } // By default, all the transitive dependencies are collected, unless filtered out @@ -2180,10 +2177,6 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, return false } - //TODO: b/296491928 Vendor APEX should use libbinder.ndk instead of libbinder once VNDK is fully deprecated. - if ch.InVendorOrProduct() && ctx.Config().IsVndkDeprecated() && child.Name() == "libbinder" { - return false - } af := apexFileForNativeLibrary(ctx, ch, vctx.handleSpecialLibs) af.transitiveDep = true |