Merge "Split framework jar." (4e361bf6) · Commits · e / os / android_build

core/clear_vars.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -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.

+8 −0

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))

+2 −1

Original line number	Diff line number	Diff line
		@@ -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) \