diff options
| author | Alex Light <allight@google.com> | 2017-05-25 09:54:15 -0700 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2017-05-25 17:40:59 +0000 |
| commit | 7b497ee08649f4d095fbcbc3964a490f66d2fa35 (patch) | |
| tree | a6ff198be77bd4fe11a87124bbb8602489f61c2b /Android.mk | |
| parent | ce38efef23c7a328efb105152bec41ee6ffa02ee (diff) | |
| download | art-7b497ee08649f4d095fbcbc3964a490f66d2fa35.tar.gz art-7b497ee08649f4d095fbcbc3964a490f66d2fa35.tar.bz2 art-7b497ee08649f4d095fbcbc3964a490f66d2fa35.zip | |
Ensure libopenjdk{,jvm,jvmti}d gets built with build-art target
Test: m clean && m -j40 build-art
Test: Manual
Bug: 62057094
Change-Id: Ib499022bfef7392eaaae085f82dc95f67407335e
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index 803ba502cb..c0935a72bc 100644 --- a/Android.mk +++ b/Android.mk @@ -87,11 +87,20 @@ ART_HOST_DEPENDENCIES := \ $(ART_HOST_EXECUTABLES) \ $(ART_HOST_DEX_DEPENDENCIES) \ $(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) + +ifeq ($(ART_BUILD_HOST_DEBUG),true) +ART_HOST_DEPENDENCIES += $(ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES) +endif + ART_TARGET_DEPENDENCIES := \ $(ART_TARGET_EXECUTABLES) \ $(ART_TARGET_DEX_DEPENDENCIES) \ $(ART_TARGET_SHARED_LIBRARY_DEPENDENCIES) +ifeq ($(ART_BUILD_TARGET_DEBUG),true) +ART_TARGET_DEPENDENCIES += $(ART_TARGET_SHARED_LIBRARY_DEBUG_DEPENDENCIES) +endif + ######################################################################## # test rules |