Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b7e4d5a authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 

Merge commit '4ae1e382' into gingerbread-plus-aosp

* commit '4ae1e382':
  Tracking merge of dalvik-dev to gingerbread
parents 870678a9 4ae1e382

Android.mk

+5 −24
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ LOCAL_INTERMEDIATE_SOURCES := \ 
			$(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 @@ fwbase_dirs_to_document += core/config/sdk 
# 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_docs_LOCAL_INTERMEDIATE_SOURCES := \ 
			$(framework_res_source_path)/com/android/internal/R.java



framework_docs_LOCAL_JAVA_LIBRARIES := \

			bouncycastle \

			core \

			ext \

			framework \