StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename preprocessed_ndk_headers to versioned_ndk_headers.

Browse Source 
The current rule runs a specific preprocessor over the source files,
and I'm adding support for generic preprocessed headers in a follow
up patch.

Test: make checkbuild
Bug: None
Change-Id: I1f3193cd595f151309e6321e1b41d8d16085379d
This commit is contained in:
Dan Albert
2018-05-24 15:02:16 -07:00
parent 19ff8b4662
commit 97f9c963ad
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cc/ndk_headers.go
View File

@@ -26,7 +26,7 @@ import (
)
var (
preprocessBionicHeaders = pctx.AndroidStaticRule("preprocessBionicHeaders",
versionBionicHeaders = pctx.AndroidStaticRule("versionBionicHeaders",
blueprint.RuleParams{
// The `&& touch $out` isn't really necessary, but Blueprint won't
// let us have only implicit outputs.
@@ -157,10 +157,10 @@ func ndkHeadersFactory() android.Module {
return module
}
type preprocessedHeaderProperties struct {
type versionedHeaderProperties struct {
// Base directory of the headers being installed. As an example:
//
// preprocessed_ndk_headers {
// versioned_ndk_headers {
// name: "foo",
// from: "include",
// to: "",
@@ -184,19 +184,19 @@ type preprocessedHeaderProperties struct {
// module does not have the srcs property, and operates on a full directory (the `from` property).
//
// Note that this is really only built to handle bionic/libc/include.
type preprocessedHeaderModule struct {
type versionedHeaderModule struct {
android.ModuleBase
properties preprocessedHeaderProperties
properties versionedHeaderProperties
installPaths android.Paths
licensePath android.ModuleSrcPath
}
func (m *preprocessedHeaderModule) DepsMutator(ctx android.BottomUpMutatorContext) {
func (m *versionedHeaderModule) DepsMutator(ctx android.BottomUpMutatorContext) {
}
func (m *preprocessedHeaderModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
func (m *versionedHeaderModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if String(m.properties.License) == "" {
ctx.PropertyErrorf("license", "field is required")
}
@@ -251,7 +251,7 @@ func processHeadersWithVersioner(ctx android.ModuleContext, srcDir, outDir andro
timestampFile := android.PathForModuleOut(ctx, "versioner.timestamp")
ctx.Build(pctx, android.BuildParams{
Rule: preprocessBionicHeaders,
Rule: versionBionicHeaders,
Description: "versioner preprocess " + srcDir.Rel(),
Output: timestampFile,
Implicits: append(srcFiles, depsGlob...),
@@ -266,8 +266,8 @@ func processHeadersWithVersioner(ctx android.ModuleContext, srcDir, outDir andro
return timestampFile
}
func preprocessedNdkHeadersFactory() android.Module {
module := &preprocessedHeaderModule{}
func versionedNdkHeadersFactory() android.Module {
module := &versionedHeaderModule{}
module.AddProperties(&module.properties)