diff options
| author | Colin Cross <ccross@android.com> | 2017-05-31 01:21:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-31 01:21:12 +0000 |
| commit | 6d301174f0502912ee7df6db4bc5c1f5cf4ee230 (patch) | |
| tree | 16cc50dd83d15f6a618eaa0607bc07128620b34b | |
| parent | b939b4b8f979816cd60c7a17c83e9bdb8e767a48 (diff) | |
| parent | 3ef79ecd1df66ad0d510621b0b48485c6f55f308 (diff) | |
| download | apache-http-6d301174f0502912ee7df6db4bc5c1f5cf4ee230.tar.gz | |
Merge "Use LOCAL_ADDITIONAL_DEPENDENCIES instead of build system internals" am: a4b31e5eda am: 0ff957d67fandroid-o-mr1-preview-2android-o-mr1-preview-1
am: 3ef79ecd1d
Change-Id: I31303b4da0797efab9d90402261dd801d6deca5e
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -121,11 +121,9 @@ include $(CLEAR_VARS) 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) |