diff options
| author | Colin Cross <ccross@android.com> | 2017-04-03 22:09:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-03 22:09:38 +0000 |
| commit | 761cc89fb3138eebf5650bc9f03e804df46be47e (patch) | |
| tree | 350ffee0648dbbb561fcb27aecdb860afd9755c7 /androidmk | |
| parent | 359c54a7fa5294462a7492ae9a3cc74ebfa3b544 (diff) | |
| parent | 1a805c2dedea1321d7a8f0a11329625f6be9d5ab (diff) | |
| download | build_soong-761cc89fb3138eebf5650bc9f03e804df46be47e.tar.gz build_soong-761cc89fb3138eebf5650bc9f03e804df46be47e.tar.bz2 build_soong-761cc89fb3138eebf5650bc9f03e804df46be47e.zip | |
Merge changes Ifc3894f0,If05b0f5f,I8cd1ef21 into oc-dev
* changes:
Fix include order
Add support for test_suites property on cc_test modules
Remove -Wl,--allow-shlib-undefined from arm64
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 053a46a2..bdca1aa1 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -105,6 +105,7 @@ func init() { "LOCAL_AIDL_INCLUDES": "aidl_includes", "LOCAL_AAPT_FLAGS": "aaptflags", "LOCAL_PACKAGE_SPLITS": "package_splits", + "LOCAL_COMPATIBILITY_SUITE": "test_suites", }) addStandardProperties(bpparser.BoolType, map[string]string{ |