From dd0295d77474e474950c939867fb0926f0356793 Mon Sep 17 00:00:00 2001 From: Inseob Kim Date: Mon, 12 Apr 2021 21:09:59 +0900 Subject: [PATCH] Support reexporting vndk from vendor snapshot Bug: 184795475 Test: soong test Change-Id: I0146de55e2ef54c1c8abd42f0f4d8b4db7444350 --- cc/snapshot_prebuilt.go | 8 ++++++++ cc/vendor_snapshot_test.go | 8 ++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cc/snapshot_prebuilt.go b/cc/snapshot_prebuilt.go index af0510272..aa707689a 100644 --- a/cc/snapshot_prebuilt.go +++ b/cc/snapshot_prebuilt.go @@ -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 diff --git a/cc/vendor_snapshot_test.go b/cc/vendor_snapshot_test.go index ed9e9d6e2..66396f749 100644 --- a/cc/vendor_snapshot_test.go +++ b/cc/vendor_snapshot_test.go @@ -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) }