Fix DepsInSameApex for some dependencies of static libraries
The implementation before libraryDependencyTag was added failed to
treat shared library dependencies with reexported headers on a
static library as crossing the apex boundary because the dependency
tag was overwritten from SharedFromStaticDepTag to sharedExportDepTag,
causing FromStatic to be false.
Bug: 162437057
Test: m checkbuild
Change-Id: I514b90aeb0f1477045e92b46d17336d4fb2fb62c
diff --git a/cc/cc.go b/cc/cc.go
index 429e516..16eed18 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2989,9 +2989,7 @@
return false
}
}
- // TODO(ccross): The libDepTag.reexportFlags is there to maintain previous behavior
- // when adding libraryDependencyTag and should be removed.
- if isLibDepTag && c.static() && libDepTag.shared() && !libDepTag.reexportFlags {
+ if isLibDepTag && c.static() && libDepTag.shared() {
// shared_lib dependency from a static lib is considered as crossing
// the APEX boundary because the dependency doesn't actually is
// linked; the dependency is used only during the compilation phase.