Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I7c70484e075e55d7238fac97a3c80910d58a65fd
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..b399769
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,73 @@
+// 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.
+
+java_sdk_library {
+ name: "org.apache.http.legacy",
+ srcs: [
+ "src/**/*.java",
+ "android/**/*.java",
+ ],
+ api_srcs: [
+ ":apache-http-stubs-sources",
+ ],
+ api_packages: [
+ "android.net.compatibility",
+ "android.net.http",
+ "com.android.internal.http.multipart",
+ "org.apache.commons.codec",
+ "org.apache.commons.codec.binary",
+ "org.apache.commons.codec.language",
+ "org.apache.commons.codec.net",
+ "org.apache.commons.logging",
+ "org.apache.commons.logging.impl",
+ "org.apache.http",
+ "org.apache.http.auth",
+ "org.apache.http.auth.params",
+ "org.apache.http.client",
+ "org.apache.http.client.entity",
+ "org.apache.http.client.methods",
+ "org.apache.http.client.params",
+ "org.apache.http.client.protocol",
+ "org.apache.http.client.utils",
+ "org.apache.http.conn",
+ "org.apache.http.conn.params",
+ "org.apache.http.conn.routing",
+ "org.apache.http.conn.scheme",
+ "org.apache.http.conn.util",
+ "org.apache.http.cookie",
+ "org.apache.http.cookie.params",
+ "org.apache.http.entity",
+ "org.apache.http.impl",
+ "org.apache.http.impl.auth",
+ "org.apache.http.impl.client",
+ "org.apache.http.impl.conn",
+ "org.apache.http.impl.conn.tsccm",
+ "org.apache.http.impl.cookie",
+ "org.apache.http.impl.entity",
+ "org.apache.http.impl.io",
+ "org.apache.http.io",
+ "org.apache.http.message",
+ "org.apache.http.params",
+ "org.apache.http.protocol",
+ "org.apache.http.util",
+ ],
+ dex_preopt: {
+ profile: "art-profile",
+ app_image: false,
+ },
+ errorprone: {
+ javacflags: ["-Xep:MissingOverride:OFF"], // b/73499927
+ },
+ metalava_enabled: false,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index db4c11a..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,192 +0,0 @@
-# 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.
-#
-LOCAL_PATH:= $(call my-dir)
-
-apache_http_src_files := \
- $(call all-java-files-under,src) \
- $(call all-java-files-under,android)
-
-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
-LOCAL_JAVA_LIBRARIES := $(apache_http_java_libs)
-LOCAL_SRC_FILES := $(apache_http_src_files)
-LOCAL_MODULE_TAGS := optional
-LOCAL_DEX_PREOPT_APP_IMAGE := false
-ifeq ($(REMOVE_OAHL_FROM_BCP),true)
-# Previously, this JAR was included on the bootclasspath so was compiled using
-# the speed-profile. ensures that it continues to be compiled using the
-# speed-profile in order to avoid regressing the performance, particularly of
-# app launch times. Without this it would be compiled using quicken (which is
-# interpreter + JIT) and so would be slower.
-LOCAL_DEX_PREOPT_GENERATE_PROFILE := true
-LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := $(LOCAL_PATH)/art-profile/$(LOCAL_MODULE).prof.txt
-endif
-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)) \
- -hidePackage com.android.okhttp \
- -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)
-
-# 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)
-
-# Check that the org.apache.http.legacy.stubs library has not changed
-# ===================================================================
-
-# Check that the API we're building hasn't changed from the not-yet-released
-# SDK version.
-$(eval $(call check-api, \
- check-apache-http-legacy-api-current, \
- $(APACHE_HTTP_LEGACY_API_FILE), \
- $(APACHE_HTTP_LEGACY_OUTPUT_API_FILE), \
- $(APACHE_HTTP_LEGACY_REMOVED_API_FILE), \
- $(APACHE_HTTP_LEGACY_OUTPUT_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) \
- ))
-
-.PHONY: check-apache-http-legacy-api
-checkapi: check-apache-http-legacy-api
-
-.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)
- @echo Copying apache-http-legacy-current.txt
- $(hide) $(ACP) $(APACHE_HTTP_LEGACY_OUTPUT_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)
-
-endif # not TARGET_BUILD_APPS
-
-apache_http_src_files :=
-apache_http_java_libs :=
-apache_http_packages :=
-apache_http_stubs_gen_stamp :=
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 694f8d2..1c8922d 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,3 +49,6 @@
# ************************************************
$(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)
+
+# runtime lib is renamed from *.boot to *.impl
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework/org.apache.http.legacy.boot.jar)
diff --git a/api/apache-http-legacy-current.txt b/api/current.txt
similarity index 99%
rename from api/apache-http-legacy-current.txt
rename to api/current.txt
index fc5482e..b9cf9c9 100644
--- a/api/apache-http-legacy-current.txt
+++ b/api/current.txt
@@ -216,21 +216,6 @@
field public static final int UNKNOWN = 0; // 0x0
}
- public final class HttpResponseCache extends java.net.ResponseCache implements java.io.Closeable {
- method public void close() throws java.io.IOException;
- method public void delete() throws java.io.IOException;
- method public void flush();
- method public java.net.CacheResponse get(java.net.URI, java.lang.String, java.util.Map<java.lang.String, java.util.List<java.lang.String>>) throws java.io.IOException;
- method public int getHitCount();
- method public static android.net.http.HttpResponseCache getInstalled();
- method public int getNetworkCount();
- method public int getRequestCount();
- method public static synchronized android.net.http.HttpResponseCache install(java.io.File, long) throws java.io.IOException;
- method public long maxSize();
- method public java.net.CacheRequest put(java.net.URI, java.net.URLConnection) throws java.io.IOException;
- method public long size();
- }
-
public class HttpsConnection {
method public static void initializeEngine(java.io.File);
}
@@ -297,6 +282,7 @@
method public java.util.Date getValidNotAfterDate();
method public deprecated java.lang.String getValidNotBefore();
method public java.util.Date getValidNotBeforeDate();
+ method public java.security.cert.X509Certificate getX509Certificate();
method public static android.net.http.SslCertificate restoreState(android.os.Bundle);
method public static android.os.Bundle saveState(android.net.http.SslCertificate);
}
@@ -698,6 +684,7 @@
ctor public LogConfigurationException(java.lang.String);
ctor public LogConfigurationException(java.lang.Throwable);
ctor public LogConfigurationException(java.lang.String, java.lang.Throwable);
+ method public java.lang.Throwable getCause();
field protected java.lang.Throwable cause;
}
diff --git a/api/apache-http-legacy-removed.txt b/api/removed.txt
similarity index 100%
copy from api/apache-http-legacy-removed.txt
copy to api/removed.txt
diff --git a/api/apache-http-legacy-removed.txt b/api/system-current.txt
similarity index 100%
copy from api/apache-http-legacy-removed.txt
copy to api/system-current.txt
diff --git a/api/apache-http-legacy-removed.txt b/api/system-removed.txt
similarity index 100%
rename from api/apache-http-legacy-removed.txt
rename to api/system-removed.txt
diff --git a/api/apache-http-legacy-removed.txt b/api/test-current.txt
similarity index 100%
copy from api/apache-http-legacy-removed.txt
copy to api/test-current.txt
diff --git a/api/apache-http-legacy-removed.txt b/api/test-removed.txt
similarity index 100%
copy from api/apache-http-legacy-removed.txt
copy to api/test-removed.txt
diff --git a/art-profile/org.apache.http.legacy.boot.prof.txt b/art-profile
similarity index 100%
rename from art-profile/org.apache.http.legacy.boot.prof.txt
rename to art-profile
