aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-02-25 08:21:14 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-02-25 08:21:14 +0000
commit7cf7592029bb4194e9987037376805a4dc2179bf (patch)
treefbed7674f7f9e080ccb135f1f2d2aa0b516e096a
parent7a8bc7d332557310a508c01944eb4529b3ac498b (diff)
parent81f38d8b0a959658f267f169c18d95466a97d587 (diff)
downloadrobolectric-7cf7592029bb4194e9987037376805a4dc2179bf.tar.gz
Snap for 4620899 from 81f38d8b0a959658f267f169c18d95466a97d587 to pi-release
Change-Id: I5121f5256829233b223cc82cdb31f0a72333387c
-rw-r--r--Android.mk7
1 files changed, 1 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk
index cb86d2e85..e0852a8fd 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
+ $(robo_full_target):android-all-$(PLATFORM_VERSION)-robolectric-$(FILE_NAME_TAG).jar)