Merge changes I514b90ae,Ie477de70
* changes: Fix DepsInSameApex for some dependencies of static libraries Expose all shared and header libraries to Make
This commit is contained in:
commit
d59540234c
21
cc/cc.go
21
cc/cc.go
|
@ -2601,12 +2601,8 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
||||||
makeLibName := c.makeLibName(ctx, ccDep, depName) + libDepTag.makeSuffix
|
makeLibName := c.makeLibName(ctx, ccDep, depName) + libDepTag.makeSuffix
|
||||||
switch {
|
switch {
|
||||||
case libDepTag.header():
|
case libDepTag.header():
|
||||||
// TODO(ccross): The reexportFlags check is there to maintain previous
|
c.Properties.AndroidMkHeaderLibs = append(
|
||||||
// behavior when adding libraryDependencyTag and should be removed.
|
c.Properties.AndroidMkHeaderLibs, makeLibName)
|
||||||
if !libDepTag.reexportFlags {
|
|
||||||
c.Properties.AndroidMkHeaderLibs = append(
|
|
||||||
c.Properties.AndroidMkHeaderLibs, makeLibName)
|
|
||||||
}
|
|
||||||
case libDepTag.shared():
|
case libDepTag.shared():
|
||||||
if ccDep.CcLibrary() {
|
if ccDep.CcLibrary() {
|
||||||
if ccDep.BuildStubs() && android.InAnyApex(depName) {
|
if ccDep.BuildStubs() && android.InAnyApex(depName) {
|
||||||
|
@ -2621,13 +2617,8 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
|
||||||
|
|
||||||
// Note: the order of libs in this list is not important because
|
// Note: the order of libs in this list is not important because
|
||||||
// they merely serve as Make dependencies and do not affect this lib itself.
|
// they merely serve as Make dependencies and do not affect this lib itself.
|
||||||
// TODO(ccross): The reexportFlags, order and ndk checks are there to
|
c.Properties.AndroidMkSharedLibs = append(
|
||||||
// maintain previous behavior when adding libraryDependencyTag and
|
c.Properties.AndroidMkSharedLibs, makeLibName)
|
||||||
// should be removed.
|
|
||||||
if !c.static() || libDepTag.reexportFlags || libDepTag.Order == lateLibraryDependency || libDepTag.ndk {
|
|
||||||
c.Properties.AndroidMkSharedLibs = append(
|
|
||||||
c.Properties.AndroidMkSharedLibs, makeLibName)
|
|
||||||
}
|
|
||||||
// Record baseLibName for snapshots.
|
// Record baseLibName for snapshots.
|
||||||
c.Properties.SnapshotSharedLibs = append(c.Properties.SnapshotSharedLibs, baseLibName(depName))
|
c.Properties.SnapshotSharedLibs = append(c.Properties.SnapshotSharedLibs, baseLibName(depName))
|
||||||
case libDepTag.static():
|
case libDepTag.static():
|
||||||
|
@ -2959,9 +2950,7 @@ func (c *Module) DepIsInSameApex(ctx android.BaseModuleContext, dep android.Modu
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// TODO(ccross): The libDepTag.reexportFlags is there to maintain previous behavior
|
if isLibDepTag && c.static() && libDepTag.shared() {
|
||||||
// when adding libraryDependencyTag and should be removed.
|
|
||||||
if isLibDepTag && c.static() && libDepTag.shared() && !libDepTag.reexportFlags {
|
|
||||||
// shared_lib dependency from a static lib is considered as crossing
|
// shared_lib dependency from a static lib is considered as crossing
|
||||||
// the APEX boundary because the dependency doesn't actually is
|
// the APEX boundary because the dependency doesn't actually is
|
||||||
// linked; the dependency is used only during the compilation phase.
|
// linked; the dependency is used only during the compilation phase.
|
||||||
|
|
Loading…
Reference in New Issue