Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d
Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
diff --git a/Android.mk b/Android.mk
index 5db6610..af50134 100644
--- a/Android.mk
+++ b/Android.mk
@@ -193,7 +193,7 @@
$(framework_res_source_path)/com/android/internal/R.java
LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core ext
+LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit ext
LOCAL_MODULE := framework
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@@ -301,34 +301,14 @@
# Intentionally not included from libcore:
# icu openssl suncompat support
libcore_to_document := \
- annotation/src/main/java/java \
- archive/src/main/java/java \
- auth/src/main/java/javax \
- awt-kernel/src/main/java/java \
- concurrent/src/main/java \
- crypto/src/main/java/javax \
dalvik/src/main/java/dalvik \
json/src/main/java \
junit/src/main/java \
- logging/src/main/java/java \
luni/src/main/java/java \
- luni-kernel/src/main/java/java \
- math/src/main/java/java \
- nio/src/main/java/java \
- nio_char/src/main/java/java \
- prefs/src/main/java/java \
- regex/src/main/java/java \
- security/src/main/java/java \
- security/src/main/java/javax \
- security-kernel/src/main/java/java \
- sql/src/main/java/java \
- sql/src/main/java/javax \
- text/src/main/java/java \
- x-net/src/main/java/javax \
- xml/src/main/java/javax \
- xml/src/main/java/org/xml/sax \
+ luni/src/main/java/javax \
+ luni/src/main/java/org/xml/sax \
+ luni/src/main/java/org/w3c \
xml/src/main/java/org/xmlpull/v1 \
- xml/src/main/java/org/w3c
non_base_dirs := \
../../external/apache-http/src/org/apache/http
@@ -361,6 +341,7 @@
$(framework_res_source_path)/com/android/internal/R.java
framework_docs_LOCAL_JAVA_LIBRARIES := \
+ bouncycastle \
core \
ext \
framework \