Merge awt-kernel, icu, luni-kernel, prefs, security-kernel, x-net into luni

Merge xml except xmlpull and kxml into luni

JavaLibrary.mk

@@ -50,7 +50,7 @@ $(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/{java,resources} 2> /dev/null)
 endef
 
 # The Java files and their associated resources.
-core_src_files := $(call all-main-java-files-under,awt-kernel dalvik dom icu json junit luni luni-kernel openssl prefs security-kernel support x-net xml)
+core_src_files := $(call all-main-java-files-under,dalvik dom json junit luni openssl support xml)
 core_resource_dirs := $(call all-core-resource-dirs,main)
 test_resource_dirs := $(call all-core-resource-dirs,test)
 
@@ -123,16 +123,6 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := core-tests-json
 include $(BUILD_JAVA_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,luni-kernel)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-luni-kernel
-include $(BUILD_JAVA_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,luni)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
@@ -146,9 +136,6 @@ LOCAL_JAVA_LIBRARIES := \
         core-tests-support \
         core-tests-dom \
         core-tests-json \
-        core-tests-luni-kernel \
-        core-tests-prefs \
-        core-tests-x-net \
         core-tests-xml \
         sqlite-jdbc
 LOCAL_DX_FLAGS := --core-library
@@ -156,16 +143,6 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := core-tests-luni
 include $(BUILD_JAVA_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,prefs)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-prefs
-include $(BUILD_JAVA_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,support)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
@@ -176,16 +153,6 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_MODULE := core-tests-support
 include $(BUILD_JAVA_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,x-net)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-x-net
-include $(BUILD_JAVA_LIBRARY)
-
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-test-java-files-under,xml)
 LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)

icu/src/main/native/sub.mk

-# This file is included by the top-level libcore Android.mk.
-# It's not a normal makefile, so we don't include CLEAR_VARS
-# or BUILD_*_LIBRARY.
-
-LOCAL_SRC_FILES := \
-	BidiWrapper.cpp \
-	ErrorCode.cpp \
-	ICU.cpp \
-	NativeBreakIterator.cpp \
-	NativeCollation.cpp \
-	NativeConverter.cpp \
-	NativeDecimalFormat.cpp \
-	NativeIDN.cpp \
-	NativeNormalizer.cpp \
-	NativeRegEx.cpp \
-	UCharacter.cpp
-
-LOCAL_C_INCLUDES += \
-	external/icu4c/common \
-	external/icu4c/i18n
-
-# Any shared/static libs that are listed here must also
-# be listed in libs/nativehelper/Android.mk.
-# TODO: fix this requirement
-
-LOCAL_SHARED_LIBRARIES += \
-	libicudata \
-	libicuuc \
-	libicui18n
-
-LOCAL_STATIC_LIBRARIES +=

luni-kernel/src/main/native/sub.mk

-# This file is included by the top-level libcore Android.mk.
-# It's not a normal makefile, so we don't include CLEAR_VARS
-# or BUILD_*_LIBRARY.
-
-LOCAL_SRC_FILES := \
-	java_lang_ProcessManager.cpp \
-	java_lang_System.cpp \
-	Register.cpp
-
-LOCAL_C_INCLUDES +=
-
-# Any shared/static libs that are listed here must also
-# be listed in libs/nativehelper/Android.mk.
-# TODO: fix this requirement
-
-LOCAL_SHARED_LIBRARIES +=
-
-LOCAL_STATIC_LIBRARIES +=