diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-20 13:16:31 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-02-22 13:00:16 -0800 |
| commit | 185ac2228eab2ae6ca47e6604257834d839bcbbf (patch) | |
| tree | 423b6d68861e4f46a49a4690882396d46a4e4c60 | |
| parent | 37cc417f94cf66eee8bb96c722cb528c073298bc (diff) | |
| download | robolectric-185ac2228eab2ae6ca47e6604257834d839bcbbf.tar.gz | |
Use FILE_NAME_TAG as part of generated jar file.
FILE_NAME_TAG has already wrapped the logic about if we should use
BUILD_NUMBER or not.
Test: m -j32
Bug: b/70351683
Change-Id: Id30c513baf8a5045f3b9d42b513ab72b7fac2ead
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index cb86d2e85..e9061117c 100644 --- a/Android.mk +++ b/Android.mk @@ -65,10 +65,5 @@ robo_stub_module_name := robolectric_android-all-stub include $(LOCAL_PATH)/include_framework_res.mk # Distribute the android-all artifact with SDK artifacts. -ifneq ($(filter eng.%,$(BUILD_NUMBER)),) $(call dist-for-goals,sdk win_sdk,\ - $(robo_full_target):android-all-$(PLATFORM_VERSION)-robolectric-eng.$(USER).jar) -else -$(call dist-for-goals,sdk win_sdk,\ - $(robo_full_target):android-all-$(PLATFORM_VERSION)-robolectric-$(BUILD_NUMBER).jar) -endif + $(LOCAL_BUILT_MODULE):android-all-$(PLATFORM_VERSION)-robolectric-$(FILE_NAME_TAG).jar) |