diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-03-19 18:30:37 -0700 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-04-05 09:59:11 -0700 |
| commit | ba78b5a21552127e95f08351455a14f3ed0040f6 (patch) | |
| tree | a166de7d4261f88ba7608311dc30e4db56c829ec /androidmk | |
| parent | 73736253f77aeead5ed9c0de01ae24c8c6f1be98 (diff) | |
| download | build_soong-ba78b5a21552127e95f08351455a14f3ed0040f6.tar.gz build_soong-ba78b5a21552127e95f08351455a14f3ed0040f6.tar.bz2 build_soong-ba78b5a21552127e95f08351455a14f3ed0040f6.zip | |
Rework vndk detection
Instead of having a module define `use_vndk: true`, assume that we're
building with the VNDK if we're installed on the vendor partition, and
BOARD_VNDK_VERSION==current. This now matches our behavior in Make.
Once BOARD_VNDK_VERSION!=current, we'll need to disable modules that
need to otherwise compile against the VNDK, since we can only compile
against the current VNDK.
Test: build.ninja for aosp_arm is the same before/after
Test: Ensure there are no boards that set BOARD_VNDK_VERSION
Change-Id: If937fa7bdb119648137af52daebadf486163484b
(cherry picked from commit 11b261472a97399a5fda9d565375637aae7639f4)
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index bdca1aa1..33e7eb39 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -120,7 +120,6 @@ func init() { "LOCAL_NO_STANDARD_LIBRARIES": "no_standard_libraries", "LOCAL_PACK_MODULE_RELOCATIONS": "pack_relocations", "LOCAL_TIDY": "tidy", - "LOCAL_USE_VNDK": "use_vndk", "LOCAL_PROPRIETARY_MODULE": "proprietary", "LOCAL_EXPORT_PACKAGE_RESOURCES": "export_package_resources", |