diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-11-18 14:54:24 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-11-28 13:45:24 -0800 |
| commit | d2ede879b5027413b288be92bdc4f320124c5d3c (patch) | |
| tree | fad2da22ce685b05ff4042ab86941b260e69b801 /cc/androidmk.go | |
| parent | 112fd2b9b1ad51d5a7c17a4859fda75592d6ef93 (diff) | |
| download | build_soong-d2ede879b5027413b288be92bdc4f320124c5d3c.tar.gz build_soong-d2ede879b5027413b288be92bdc4f320124c5d3c.tar.bz2 build_soong-d2ede879b5027413b288be92bdc4f320124c5d3c.zip | |
Add basic VNDK support in Soong
Export a list of libraries in the VNDK, which is currently empty.
Take in Make's global BOARD_VNDK_VERSION, and use that as the SDK
version for modules that specify use_vndk: true.
Modules that use the vndk have some configuration as if they were
building against the NDK (the absence of globally defined headers), but
in other cases look like platform modules (using the platform libc++,
for now).
This change does not attempt to enforce any linking constraints, that
will come in a later patch.
Test: out/soong/build.ninja doesn't change
Change-Id: I3be206b67015ac5177b7eef4a451c579e3dc903f
Diffstat (limited to 'cc/androidmk.go')
| -rw-r--r-- | cc/androidmk.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cc/androidmk.go b/cc/androidmk.go index 50c183e9..709ac59b 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -59,6 +59,9 @@ func (c *Module) AndroidMk() (ret android.AndroidMkData, err error) { if c.Target().Os == android.Android && c.Properties.Sdk_version != "" { fmt.Fprintln(w, "LOCAL_SDK_VERSION := "+c.Properties.Sdk_version) fmt.Fprintln(w, "LOCAL_NDK_STL_VARIANT := none") + } else if c.Target().Os == android.Android && c.Properties.Use_vndk { + fmt.Fprintln(w, "LOCAL_USE_VNDK := true") + fmt.Fprintln(w, "LOCAL_NDK_STL_VARIANT := none") } else { // These are already included in LOCAL_SHARED_LIBRARIES fmt.Fprintln(w, "LOCAL_CXX_STL := none") |