Merge "Migrate apache-http stubs generation to Soong."
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..829dba9
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,88 @@
+// Copyright (C) 2014 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+droiddoc {
+ name: "apache-http-stubs-gen-docs",
+ srcs: [
+ "src/**/*.java",
+ "android/**/*.java",
+ ":apache-http-stubs-sources",
+ ],
+ libs: [
+ "conscrypt",
+ "bouncycastle",
+ "okhttp",
+ ],
+ custom_template: "droiddoc-templates-sdk",
+ api_tag_name: "APACHE_HTTP",
+ api_filename: "apache-http-api.txt",
+ removed_api_filename: "apache-http-removed.txt",
+ args: "-stubpackages com.android.internal.http.multipart:" +
+ "org.apache.commons.logging:" +
+ "org.apache.commons.logging.impl:" +
+ "org.apache.commons.codec:" +
+ "org.apache.commons.codec.net:" +
+ "org.apache.commons.codec.language:" +
+ "org.apache.commons.codec.binary:" +
+ "org.apache.http.params:" +
+ "org.apache.http:" +
+ "org.apache.http.client.params:" +
+ "org.apache.http.client:" +
+ "org.apache.http.client.utils:" +
+ "org.apache.http.client.protocol:" +
+ "org.apache.http.client.methods:" +
+ "org.apache.http.client.entity:" +
+ "org.apache.http.protocol:" +
+ "org.apache.http.impl:" +
+ "org.apache.http.impl.client:" +
+ "org.apache.http.impl.auth:" +
+ "org.apache.http.impl.cookie:" +
+ "org.apache.http.impl.entity:" +
+ "org.apache.http.impl.io:" +
+ "org.apache.http.impl.conn:" +
+ "org.apache.http.impl.conn.tsccm:" +
+ "org.apache.http.message:" +
+ "org.apache.http.auth.params:" +
+ "org.apache.http.auth:" +
+ "org.apache.http.cookie.params:" +
+ "org.apache.http.cookie:" +
+ "org.apache.http.util:" +
+ "org.apache.http.entity:" +
+ "org.apache.http.io:" +
+ "org.apache.http.conn.params:" +
+ "org.apache.http.conn:" +
+ "org.apache.http.conn.routing:" +
+ "org.apache.http.conn.scheme:" +
+ "org.apache.http.conn.util:" +
+ "android.net.compatibility:" +
+ "android.net.http -nodocs",
+ sdk_version: "21",
+ installable: false,
+}
+
+java_library_static {
+ name: "org.apache.http.legacy",
+ srcs: [
+ ":apache-http-stubs-gen-docs",
+ ],
+ product_variables: {
+ pdk: {
+ enabled: false,
+ },
+ unbundled_build: {
+ enabled: false,
+ },
+ },
+ sdk_version: "21",
+}
diff --git a/Android.mk b/Android.mk
index d4e42b7..142bed6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,48 +20,6 @@
apache_http_java_libs := conscrypt
-apache_http_packages := $(strip \
- com.android.internal.http.multipart \
- org.apache.commons.logging \
- org.apache.commons.logging.impl \
- org.apache.commons.codec \
- org.apache.commons.codec.net \
- org.apache.commons.codec.language \
- org.apache.commons.codec.binary \
- org.apache.http.params \
- org.apache.http \
- org.apache.http.client.params \
- org.apache.http.client \
- org.apache.http.client.utils \
- org.apache.http.client.protocol \
- org.apache.http.client.methods \
- org.apache.http.client.entity \
- org.apache.http.protocol \
- org.apache.http.impl \
- org.apache.http.impl.client \
- org.apache.http.impl.auth \
- org.apache.http.impl.cookie \
- org.apache.http.impl.entity \
- org.apache.http.impl.io \
- org.apache.http.impl.conn \
- org.apache.http.impl.conn.tsccm \
- org.apache.http.message \
- org.apache.http.auth.params \
- org.apache.http.auth \
- org.apache.http.cookie.params \
- org.apache.http.cookie \
- org.apache.http.util \
- org.apache.http.entity \
- org.apache.http.io \
- org.apache.http.conn.params \
- org.apache.http.conn \
- org.apache.http.conn.routing \
- org.apache.http.conn.scheme \
- org.apache.http.conn.util \
- android.net.compatibility \
- android.net.http \
-)
-
include $(CLEAR_VARS)
LOCAL_MODULE := org.apache.http.legacy.boot
LOCAL_MODULE_TAGS := optional
@@ -70,74 +28,13 @@
LOCAL_MODULE_TAGS := optional
include $(BUILD_JAVA_LIBRARY)
-##############################################
-# Generate the stub source files
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(apache_http_src_files)
-LOCAL_SRC_FILES += \
- ../../frameworks/base/core/java/org/apache/http/conn/ConnectTimeoutException.java \
- ../../frameworks/base/core/java/org/apache/http/conn/scheme/HostNameResolver.java \
- ../../frameworks/base/core/java/org/apache/http/conn/scheme/LayeredSocketFactory.java \
- ../../frameworks/base/core/java/org/apache/http/conn/scheme/SocketFactory.java \
- ../../frameworks/base/core/java/org/apache/http/conn/ssl/AbstractVerifier.java \
- ../../frameworks/base/core/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java \
- ../../frameworks/base/core/java/org/apache/http/conn/ssl/AndroidDistinguishedNameParser.java \
- ../../frameworks/base/core/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java \
- ../../frameworks/base/core/java/org/apache/http/conn/ssl/SSLSocketFactory.java \
- ../../frameworks/base/core/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java \
- ../../frameworks/base/core/java/org/apache/http/conn/ssl/X509HostnameVerifier.java \
- ../../frameworks/base/core/java/org/apache/http/params/CoreConnectionPNames.java \
- ../../frameworks/base/core/java/org/apache/http/params/HttpConnectionParams.java \
- ../../frameworks/base/core/java/org/apache/http/params/HttpParams.java \
- ../../frameworks/base/core/java/android/net/http/HttpResponseCache.java \
- ../../frameworks/base/core/java/android/net/http/SslCertificate.java \
- ../../frameworks/base/core/java/android/net/http/SslError.java \
- ../../frameworks/base/core/java/com/android/internal/util/HexDump.java \
-
-LOCAL_JAVA_LIBRARIES := bouncycastle okhttp $(apache_http_java_libs)
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src \
- $(LOCAL_PATH)/android \
- $(LOCAL_PATH)/../../frameworks/base/core/java/org/apache
-
-APACHE_HTTP_LEGACY_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/api.txt
-APACHE_HTTP_LEGACY_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy.stubs_intermediates/removed.txt
-
APACHE_HTTP_LEGACY_API_FILE := $(LOCAL_PATH)/api/apache-http-legacy-current.txt
APACHE_HTTP_LEGACY_REMOVED_API_FILE := $(LOCAL_PATH)/api/apache-http-legacy-removed.txt
-LOCAL_DROIDDOC_OPTIONS:= \
- -stubpackages $(subst $(space),:,$(apache_http_packages)) \
- -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/org.apache.http.legacy_intermediates/src \
- -nodocs \
- -api $(APACHE_HTTP_LEGACY_OUTPUT_API_FILE) \
- -removedApi $(APACHE_HTTP_LEGACY_OUTPUT_REMOVED_API_FILE) \
-
-LOCAL_SDK_VERSION := 21
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_MODULE := apache-http-stubs-gen
-
-include $(BUILD_DROIDDOC)
-
-# Remember the target that will trigger the code generation.
-apache_http_stubs_gen_stamp := $(full_target)
-
-# Add some additional dependencies
-$(APACHE_HTTP_LEGACY_OUTPUT_API_FILE): $(full_target)
-$(APACHE_HTTP_LEGACY_OUTPUT_REMOVED_API_FILE): $(full_target)
-
# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
-###############################################
-# Build the stub source files into a jar.
-include $(CLEAR_VARS)
-LOCAL_MODULE := org.apache.http.legacy
-LOCAL_SOURCE_FILES_ALL_GENERATED := true
-LOCAL_SDK_VERSION := 21
-# Make sure to run droiddoc first to generate the stub source files.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(apache_http_stubs_gen_stamp)
-include $(BUILD_STATIC_JAVA_LIBRARY)
+full_classes_jar := $(call intermediates-dir-for,JAVA_LIBRARIES,org.apache.http.legacy,,COMMON)/classes.jar
# 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)
@@ -149,16 +46,16 @@
$(eval $(call check-api, \
check-apache-http-legacy-api-current, \
$(APACHE_HTTP_LEGACY_API_FILE), \
- $(APACHE_HTTP_LEGACY_OUTPUT_API_FILE), \
+ $(INTERNAL_PLATFORM_APACHE_HTTP_API_FILE), \
$(APACHE_HTTP_LEGACY_REMOVED_API_FILE), \
- $(APACHE_HTTP_LEGACY_OUTPUT_REMOVED_API_FILE), \
+ $(INTERNAL_PLATFORM_APACHE_HTTP_REMOVED_API_FILE), \
-error 2 -error 3 -error 4 -error 5 -error 6 \
-error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
-error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \
-error 25 -error 26 -error 27, \
cat $(LOCAL_PATH)/api/apicheck_msg_apache_http_legacy.txt, \
check-apache-http-legacy-api, \
- $(call doc-timestamp-for,apache-http-stubs-gen) \
+ $(OUT_DOCS)/apache-http-stubs-gen-docs-stubs.srcjar \
))
.PHONY: check-apache-http-legacy-api
@@ -167,15 +64,13 @@
.PHONY: update-apache-http-legacy-api
update-api: update-apache-http-legacy-api
-update-apache-http-legacy-api: $(APACHE_HTTP_LEGACY_OUTPUT_API_FILE) | $(ACP)
+update-apache-http-legacy-api: $(INTERNAL_PLATFORM_APACHE_HTTP_API_FILE) | $(ACP)
@echo Copying apache-http-legacy-current.txt
- $(hide) $(ACP) $(APACHE_HTTP_LEGACY_OUTPUT_API_FILE) $(APACHE_HTTP_LEGACY_API_FILE)
+ $(hide) $(ACP) $(INTERNAL_PLATFORM_APACHE_HTTP_API_FILE) $(APACHE_HTTP_LEGACY_API_FILE)
@echo Copying apache-http-legacy-removed.txt
- $(hide) $(ACP) $(APACHE_HTTP_LEGACY_OUTPUT_REMOVED_API_FILE) $(APACHE_HTTP_LEGACY_REMOVED_API_FILE)
+ $(hide) $(ACP) $(INTERNAL_PLATFORM_APACHE_HTTP_REMOVED_API_FILE) $(APACHE_HTTP_LEGACY_REMOVED_API_FILE)
endif # not TARGET_BUILD_APPS
apache_http_src_files :=
apache_http_java_libs :=
-apache_http_packages :=
-apache_http_stubs_gen_stamp :=
