diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-03-19 18:30:37 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-03-29 04:33:25 +0000 |
| commit | 11b261472a97399a5fda9d565375637aae7639f4 (patch) | |
| tree | 2de6f556bddff8f9b0047adc1b09179e8dda6bc6 /androidmk | |
| parent | 9e3f627ea73b3982d8be5ad8b402b4264aab0b18 (diff) | |
| download | build_soong-11b261472a97399a5fda9d565375637aae7639f4.tar.gz build_soong-11b261472a97399a5fda9d565375637aae7639f4.tar.bz2 build_soong-11b261472a97399a5fda9d565375637aae7639f4.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
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 331bb4f4..6d08ca8b 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -118,7 +118,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", |