From 10c4136b1f838de9c0f3832f642eb92e439dce1d Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Tue, 3 Dec 2024 01:33:09 +0000 Subject: Reland "Skip packaging cross container cc deps of apk-in-apex" This relands https://r.android.com/3375509, but uses `NotInPlatform` of the top-level app in `collectAppDeps`. The original implementation was reverted because it skipped packaging jni lib deps that crossed an api domain boundary. This is the intended behavior for apk-in-apex, but runs into issues for android_test. The linkerconfig for these has been setup to allow access to LLNDK (in system) and LLNDK_MOVED_TO_APEX_LIBRARIES. Other libraries like `libnativebridge` cannot be accessed by tests on device, so the tests need their own copy. Test: m ArtServiceTests Test: verified that the contents of the apk are same before and after Bug: 375473764 Change-Id: I3a3985e576959c3113fc1e11f43dbe669603ec22 --- rust/rust.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'rust/rust.go') diff --git a/rust/rust.go b/rust/rust.go index 48f946e1c..eeb228ceb 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -722,6 +722,10 @@ func (mod *Module) IsNdk(config android.Config) bool { return false } +func (mod *Module) HasStubsVariants() bool { + return false +} + func (mod *Module) IsStubs() bool { return false } -- cgit v1.2.3-59-g8ed1b