openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes from topic "reexport_vndk_from_vendor_snapshot" am: ff5cc064c2 am: 52be5348c7 am: 9295f870c5 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1671539

Change-Id: I6aeedfc71cf76e16b0c6bf0b8a8a7f85a4c9c780
This commit is contained in:
Inseob Kim 2021-04-14 02:37:03 +00:00 committed by Automerger Merge Worker
parent 5f06f3b36e 9295f870c5
commit 2fb95e0dc6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cc/snapshot_prebuilt.go
View File

@ -559,10 +559,18 @@ func (p *snapshotLibraryDecorator) link(ctx ModuleContext, flags Flags, deps Pat
return nil
}
// Flags specified directly to this module.
p.libraryDecorator.reexportDirs(android.PathsForModuleSrc(ctx, p.properties.Export_include_dirs)...)
p.libraryDecorator.reexportSystemDirs(android.PathsForModuleSrc(ctx, p.properties.Export_system_include_dirs)...)
p.libraryDecorator.reexportFlags(p.properties.Export_flags...)
// Flags reexported from dependencies. (e.g. vndk_prebuilt_shared)
p.libraryDecorator.reexportDirs(deps.ReexportedDirs...)
p.libraryDecorator.reexportSystemDirs(deps.ReexportedSystemDirs...)
p.libraryDecorator.reexportFlags(deps.ReexportedFlags...)
p.libraryDecorator.reexportDeps(deps.ReexportedDeps...)
p.libraryDecorator.addExportedGeneratedHeaders(deps.ReexportedGeneratedHeaders...)
in := android.PathForModuleSrc(ctx, *p.properties.Src)
p.unstrippedOutputFile = in

8
cc/vendor_snapshot_test.go
View File

@ -506,13 +506,13 @@ func TestVendorSnapshotUse(t *testing.T) {
arch: {
arm64: {
src: "libvndk.a",
export_include_dirs: ["include/libvndk"],
},
arm: {
src: "libvndk.a",
export_include_dirs: ["include/libvndk"],
},
},
shared_libs: ["libvndk"],
export_shared_lib_headers: ["libvndk"],
}
vendor_snapshot_shared {
@ -848,9 +848,9 @@ func TestVendorSnapshotUse(t *testing.T) {
t.Errorf("libflags for libclientCfi must contain %#v, but was %#v", libvendorCfiOutputPaths[0], libclientCfiLdFlags)
}
// bin_without_snapshot uses libvndk.vendor_static.30.arm64
// bin_without_snapshot uses libvndk.vendor_static.30.arm64 (which reexports vndk's exported headers)
binWithoutSnapshotCcFlags := ctx.ModuleForTests("bin_without_snapshot", binaryVariant).Rule("cc").Args["cFlags"]
if !strings.Contains(binWithoutSnapshotCcFlags, "-Ivendor/include/libvndk") {
if !strings.Contains(binWithoutSnapshotCcFlags, "-Ivndk/include/libvndk") {
t.Errorf("flags for bin_without_snapshot must contain %#v, but was %#v.",
"-Ivendor/include/libvndk", binWithoutSnapshotCcFlags)
}