Merge changes from topic "libbinder_ndk-remove-cpp-headers" into main

* changes:
  ndk_library: limit exports
  Reland "Truely re-export export_header_libs from ndk_library"
  ndk_library depends on the correct arch variant of cc_library_headers
This commit is contained in:
Steven Moreland
2024-09-04 18:23:19 +00:00
committed by Gerrit Code Review
3 changed files with 27 additions and 3 deletions

View File

@@ -493,7 +493,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,
}
}