summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2018-04-04 09:35:08 -0700
committerMathieu Chartier <mathieuc@google.com>2018-05-02 20:27:43 +0000
commit47b7e876148e345142200af4ba8b99862ddcbdaf (patch)
treec2e0a6f4db0498afa10f328ffcd671a149655bf3
parent8d60563204c843111a2ef3f72abdba85c4f5febf (diff)
downloadapache-http-47b7e876148e345142200af4ba8b99862ddcbdaf.tar.gz
In the case where the special shared library "&" is passed in, it may be possible to load the app image twice in the same context. This can cause various issues such as ICCE and verifier errors. Bug: 77342775 Test: make Change-Id: If2d0ee8d293b383ec585450ef54e191fa7e84aa0
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 0fc7e26..db4c11a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -68,6 +68,7 @@ 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