diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-09 13:06:40 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-04-09 18:23:09 +0100 |
| commit | 3049bb7f4224f055fc9f4d8a8667655ae8392cab (patch) | |
| tree | 06fbf68fdfd1447301f78b8f2fadbc0308f16a4b | |
| parent | abddcd89fdee97472335795c6649d4aec99cb802 (diff) | |
| download | android_external_apache-http-3049bb7f4224f055fc9f4d8a8667655ae8392cab.tar.gz android_external_apache-http-3049bb7f4224f055fc9f4d8a8667655ae8392cab.tar.bz2 android_external_apache-http-3049bb7f4224f055fc9f4d8a8667655ae8392cab.zip | |
Make org.apache.http.legacy a stubs target.
Also, rename the non-stubs org.apache.http.legacy jar ->
org.apache.http.legacy.boot and include it in the boot classpath.
Change-Id: Ibcfa5429f6565e86ab03bbc793e20f1860e3821a
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | CleanSpec.mk | 2 |
2 files changed, 6 insertions, 3 deletions
@@ -63,7 +63,7 @@ apache_http_packages := $(strip \ ) include $(CLEAR_VARS) -LOCAL_MODULE := org.apache.http.legacy +LOCAL_MODULE := org.apache.http.legacy.boot LOCAL_MODULE_TAGS := optional LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs) LOCAL_SRC_FILES := $(apache_http_src_files) @@ -82,7 +82,7 @@ LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src \ LOCAL_DROIDDOC_OPTIONS:= \ -stubpackages $(subst $(space),:,$(apache_http_packages)) \ - -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/apache-http-stubs_intermediates/src \ + -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/src \ -nodocs LOCAL_SDK_VERSION := 21 @@ -95,10 +95,11 @@ apache_http_stubs_gen_stamp := $(full_target) ############################################### # Build the stub source files into a jar. include $(CLEAR_VARS) -LOCAL_MODULE := apache-http-stubs +LOCAL_MODULE := org.apache.http.legacy LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs) LOCAL_SOURCE_FILES_ALL_GENERATED := true 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) diff --git a/CleanSpec.mk b/CleanSpec.mk index b84e1b6..694f8d2 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -47,3 +47,5 @@ # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/org.apache.http.legacy_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/apache-http-stubs_intermediates) |