diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index f5c2bc6904949..229a6ac05bb19 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -132,5 +132,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android.test.base-minus-junit
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
+# Archive a copy of the classes.jar in SDK build.
+$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.legacy.jar)
+
 # additionally, build unit tests in a separate .apk
 include $(call all-makefiles-under,$(LOCAL_PATH))