diff options
author | Jeff Brown <jeffbrown@google.com> | 2013-07-17 20:29:51 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2013-07-17 21:08:18 -0700 |
commit | ae859f9b64fd1740471e94f3417f63f4082a2e02 (patch) | |
tree | 28458ee45aae79254080f721886704e7bf65fd29 /core | |
parent | 0a2c858bb650f3daca550bf26d17286ecee56cd8 (diff) | |
download | build-ae859f9b64fd1740471e94f3417f63f4082a2e02.zip build-ae859f9b64fd1740471e94f3417f63f4082a2e02.tar.gz build-ae859f9b64fd1740471e94f3417f63f4082a2e02.tar.bz2 |
Split framework jar.
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
Diffstat (limited to 'core')
-rw-r--r-- | core/clear_vars.mk | 1 | ||||
-rw-r--r-- | core/definitions.mk | 8 | ||||
-rw-r--r-- | core/dex_preopt.mk | 2 | ||||
-rw-r--r-- | core/droiddoc.mk | 2 | ||||
-rw-r--r-- | core/java.mk | 3 | ||||
-rw-r--r-- | core/pathmap.mk | 5 |
6 files changed, 13 insertions, 8 deletions
diff --git a/core/clear_vars.mk b/core/clear_vars.mk index 11f7f84..3aed193 100644 --- a/core/clear_vars.mk +++ b/core/clear_vars.mk @@ -129,6 +129,7 @@ LOCAL_CTS_TEST_RUNNER:= LOCAL_CLANG:= LOCAL_ADDRESS_SANITIZER:= LOCAL_JAR_EXCLUDE_FILES:= +LOCAL_JAR_PACKAGES:= LOCAL_LINT_FLAGS:= LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true # Don't delete the META_INF dir when merging static Java libraries. diff --git a/core/definitions.mk b/core/definitions.mk index bf9901e..990e880 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1511,6 +1511,10 @@ $(if $(PRIVATE_JAR_EXCLUDE_FILES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DI -name $(word 1, $(PRIVATE_JAR_EXCLUDE_FILES)) \ $(addprefix -o -name , $(wordlist 2, 999, $(PRIVATE_JAR_EXCLUDE_FILES))) \ | xargs rm -rf) +$(if $(PRIVATE_JAR_PACKAGES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) -mindepth 1 -type d \ + $(foreach pkg, $(PRIVATE_JAR_PACKAGES), \ + -not -path $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))) \ + | xargs rm -rf) $(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \ $@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) . endef @@ -1558,6 +1562,10 @@ $(if $(PRIVATE_JAR_EXCLUDE_FILES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DI -name $(word 1, $(PRIVATE_JAR_EXCLUDE_FILES)) \ $(addprefix -o -name , $(wordlist 2, 999, $(PRIVATE_JAR_EXCLUDE_FILES))) \ | xargs rm -rf) +$(if $(PRIVATE_JAR_PACKAGES), $(hide) find $(PRIVATE_CLASS_INTERMEDIATES_DIR) -mindepth 1 -type d \ + $(foreach pkg, $(PRIVATE_JAR_PACKAGES), \ + -not -path $(PRIVATE_CLASS_INTERMEDIATES_DIR)/$(subst .,/,$(pkg))) \ + | xargs rm -rf) $(hide) jar $(if $(strip $(PRIVATE_JAR_MANIFEST)),-cfm,-cf) \ $@ $(PRIVATE_JAR_MANIFEST) -C $(PRIVATE_CLASS_INTERMEDIATES_DIR) . $(hide) mv $(PRIVATE_CLASS_INTERMEDIATES_DIR)/newstamp $(PRIVATE_CLASS_INTERMEDIATES_DIR)/stamp diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 8b2c868..ce27763 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -4,7 +4,7 @@ #################################### # TODO: replace it with device's BOOTCLASSPATH -DEXPREOPT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium +DEXPREOPT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:telephony-common:voip-common:mms-common:android.policy:services:apache-xml:webviewchromium DEXPREOPT_BOOT_JARS_MODULES := $(subst :, ,$(DEXPREOPT_BOOT_JARS)) DEXPREOPT_BUILD_DIR := $(OUT_DIR) diff --git a/core/droiddoc.mk b/core/droiddoc.mk index 8a5c556..0d3094d 100644 --- a/core/droiddoc.mk +++ b/core/droiddoc.mk @@ -69,7 +69,7 @@ ifneq ($(LOCAL_SDK_VERSION),) LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES) endif else - LOCAL_JAVA_LIBRARIES := core ext framework $(LOCAL_JAVA_LIBRARIES) + LOCAL_JAVA_LIBRARIES := core ext framework framework2 $(LOCAL_JAVA_LIBRARIES) endif # LOCAL_SDK_VERSION LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) diff --git a/core/java.mk b/core/java.mk index 5315ccc..c7e93b7 100644 --- a/core/java.mk +++ b/core/java.mk @@ -43,7 +43,7 @@ ifneq ($(LOCAL_SDK_VERSION),) endif else ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true) - LOCAL_JAVA_LIBRARIES := core core-junit ext framework $(LOCAL_JAVA_LIBRARIES) + LOCAL_JAVA_LIBRARIES := core core-junit ext framework framework2 $(LOCAL_JAVA_LIBRARIES) endif endif @@ -337,6 +337,7 @@ $(full_classes_compiled_jar): PRIVATE_WARNINGS_ENABLE := $(LOCAL_WARNINGS_ENABLE # via deps on the target that generates the sources. $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES) +$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES) $(full_classes_compiled_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF) $(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \ $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \ diff --git a/core/pathmap.mk b/core/pathmap.mk index f3a9e78..5dfc543 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -75,11 +75,6 @@ JNI_H_INCLUDE := $(call include-path-for,libnativehelper)/nativehelper # A list of all source roots under frameworks/base, which will be # built into the android.jar. # -# Note - "common" is included here, even though it is also built -# into a static library (android-common) for unbundled use. This -# is so common and the other framework libraries can have mutual -# interdependencies. -# FRAMEWORKS_BASE_SUBDIRS := \ $(addsuffix /java, \ core \ |