diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-03-19 13:44:32 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-04-07 10:18:56 -0700 |
| commit | b916b80bf301545595a8263776180c1db90a9ccc (patch) | |
| tree | 7926dfa450992f5709c4475f7ea4262a26901ee0 /cc/ndk_headers.go | |
| parent | 86a1c7dd157b7ffe1d0a2d87ae4b497dcbd09151 (diff) | |
| download | build_soong-b916b80bf301545595a8263776180c1db90a9ccc.tar.gz build_soong-b916b80bf301545595a8263776180c1db90a9ccc.tar.bz2 build_soong-b916b80bf301545595a8263776180c1db90a9ccc.zip | |
Add LLNDK support for the VNDK
Instead of using the NDK headers and libraries, add LL-NDK specific
headers and library stubs for VNDK users. This allows us to provide an
expanded liblog interface.
Test: aosp_arm; m -j
Test: Enable BOARD_VNDK_VERSION on aosp_arm; m -j
Test: Inspect out/soong/build.ninja before/after (w/o vndk)
Change-Id: Ic85f07fa10c695b5baab10c41f5e0ad38700bf3d
Diffstat (limited to 'cc/ndk_headers.go')
| -rw-r--r-- | cc/ndk_headers.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cc/ndk_headers.go b/cc/ndk_headers.go index 6a083aed..deb735a9 100644 --- a/cc/ndk_headers.go +++ b/cc/ndk_headers.go @@ -204,6 +204,10 @@ func (m *preprocessedHeaderModule) GenerateAndroidBuildActions(ctx android.Modul ctx.ModuleErrorf("glob %q matched zero files", m.properties.From) } + processHeadersWithVersioner(ctx, fromSrcPath, toOutputPath, srcFiles, installPaths) +} + +func processHeadersWithVersioner(ctx android.ModuleContext, srcDir, outDir android.Path, srcFiles android.Paths, installPaths []android.WritablePath) android.Path { // The versioner depends on a dependencies directory to simplify determining include paths // when parsing headers. This directory contains architecture specific directories as well // as a common directory, each of which contains symlinks to the actually directories to @@ -239,10 +243,12 @@ func (m *preprocessedHeaderModule) GenerateAndroidBuildActions(ctx android.Modul ImplicitOutputs: installPaths, Args: map[string]string{ "depsPath": depsPath.String(), - "srcDir": fromSrcPath.String(), - "outDir": toOutputPath.String(), + "srcDir": srcDir.String(), + "outDir": outDir.String(), }, }) + + return timestampFile } func preprocessedNdkHeadersFactory() (blueprint.Module, []interface{}) { |