release-request-63504342-e033-4b9f-9c68-68bdd28fdc7c-for-git_oc-mr1-release-4054002 snap-temp-L53000000069019913

Change-Id: Idb9341955256c2566cdf4c7feca4980a966f7858
diff --git a/Android.mk b/Android.mk
index c348fdc..79df821 100644
--- a/Android.mk
+++ b/Android.mk
@@ -121,11 +121,9 @@
 LOCAL_MODULE := org.apache.http.legacy
 LOCAL_SOURCE_FILES_ALL_GENERATED := true
 LOCAL_SDK_VERSION := 21
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
 # Make sure to run droiddoc first to generate the stub source files.
-$(full_classes_compiled_jar) : $(apache_http_stubs_gen_stamp)
-$(full_classes_jack) : $(apache_http_stubs_gen_stamp)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(apache_http_stubs_gen_stamp)
+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):org.apache.http.legacy.jar)