Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 012ae1f4 authored by Christopher Parsons's avatar Christopher Parsons Committed by Gerrit Code Review
Browse files

Merge "Use correct includes for mixed build gen headers"

parents 1301b5cc e59af4e1

android/bazel.go

+0 −1
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ var ( 
		"liblinker_debuggerd_stub",      // ruperts@, cc_library_static, depends on //system/libbase

		"libbionic_tests_headers_posix", // ruperts@, cc_library_static

		"libc_dns",                      // ruperts@, cc_library_static

		"generated_android_ids",         // cparsons@, genrule

		"note_memtag_heap_async",        // cparsons@, cc_library_static

		"note_memtag_heap_sync",         // cparsons@, cc_library_static

	}

genrule/genrule.go

+5 −0
Original line number Diff line number Diff line
@@ -229,11 +229,16 @@ func (c *Module) generateBazelBuildActions(ctx android.ModuleContext, label stri 
	filePaths, ok := bazelCtx.GetOutputFiles(label, ctx.Arch().ArchType)

	if ok {

		var bazelOutputFiles android.Paths

		exportIncludeDirs := map[string]bool{}

		for _, bazelOutputFile := range filePaths {

			bazelOutputFiles = append(bazelOutputFiles, android.PathForBazelOut(ctx, bazelOutputFile))

			exportIncludeDirs[filepath.Dir(bazelOutputFile)] = true

		}

		c.outputFiles = bazelOutputFiles

		c.outputDeps = bazelOutputFiles

		for includePath, _ := range exportIncludeDirs {

			c.exportedIncludeDirs = append(c.exportedIncludeDirs, android.PathForBazelOut(ctx, includePath))

		}

	}

	return ok

}