From bedc997c4031351aaf1739180af39d34b5af8c2a Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 3 Sep 2024 21:46:14 +0000 Subject: [PATCH] Reland "Truely re-export export_header_libs from ndk_library" This reverts commit 7f1ae59d94d95d56853f4e4b74b9292578faac78. Reason for revert: b/357711733, reland with allowlist Bug: 357711733 Change-Id: I11864eb2168c4333ad5759d0d057fda8529da24e Test: build --- cc/ndk_library.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cc/ndk_library.go b/cc/ndk_library.go index 3e35ef50a..5250b8610 100644 --- a/cc/ndk_library.go +++ b/cc/ndk_library.go @@ -484,7 +484,8 @@ func (c *stubDecorator) compile(ctx ModuleContext, flags Flags, deps PathDeps) O // Add a dependency on the header modules of this ndk_library func (linker *stubDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps { return Deps{ - HeaderLibs: linker.properties.Export_header_libs, + ReexportHeaderLibHeaders: linker.properties.Export_header_libs, + HeaderLibs: linker.properties.Export_header_libs, } }