Merge "Remove support of disabling Jack." (77b63536) · Commits · e / os / android_build

core/clear_vars.mk

+2 −4

Original line number	Diff line number	Diff line
		@@ -106,10 +106,9 @@ LOCAL_AIDL_INCLUDES:=
		LOCAL_JARJAR_RULES:=
		LOCAL_ADDITIONAL_JAVA_DIR:=
		LOCAL_ALLOW_UNDEFINED_SYMBOLS:=
		LOCAL_DX_FLAGS:=
		LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental
		# full or incremental
		LOCAL_JACK_ENABLED:=full
		LOCAL_JACK_FLAGS:=
		LOCAL_JILL_FLAGS:=
		LOCAL_CERTIFICATE:=
		LOCAL_SDK_VERSION:=
		LOCAL_SDK_RES_VERSION:=
		@@ -153,7 +152,6 @@ LOCAL_JAR_EXCLUDE_PACKAGES:=
		LOCAL_SOURCE_FILES_ALL_GENERATED:= # '',true
		# Don't delete the META_INF dir when merging static Java libraries.
		LOCAL_DONT_DELETE_JAR_META_INF:=
		LOCAL_DONT_DELETE_JAR_DIRS:=
		LOCAL_ADDITIONAL_CERTIFICATES:=
		LOCAL_PREBUILT_MODULE_FILE:=
		LOCAL_POST_LINK_CMD:=

core/combo/javac.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -9,11 +9,6 @@
		# COMMON_JAVAC -- Java compiler command with common arguments
		#

		ifndef ANDROID_COMPILE_WITH_JACK
		# Defines if compilation with jack is enabled by default.
		ANDROID_COMPILE_WITH_JACK := true
		endif

		common_jdk_flags := -Xmaxerrs 9999999

		# Use the indexer wrapper to index the codebase instead of the javac compiler

core/config.mk

+0 −5

Original line number	Diff line number	Diff line
		@@ -545,11 +545,6 @@ MKTARBALL := build/tools/mktarball.sh
		TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)
		JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

		ifeq ($(ANDROID_COMPILE_WITH_JACK),true)
		DEFAULT_JACK_ENABLED:=full
		else
		DEFAULT_JACK_ENABLED:=
		endif
		ifneq ($(ANDROID_JACK_EXTRA_ARGS),)
		DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)
		else

core/configure_local_jack.mk

+1 −8

Original line number	Diff line number	Diff line
		@@ -21,16 +21,9 @@ endif
		LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED))
		LOCAL_MODULE := $(strip $(LOCAL_MODULE))

		ifneq ($(LOCAL_JACK_ENABLED),full)
		ifneq ($(LOCAL_JACK_ENABLED),incremental)
		ifdef LOCAL_JACK_ENABLED
		ifneq ($(LOCAL_JACK_ENABLED),disabled)
		ifeq ($(filter full incremental,$(LOCAL_JACK_ENABLED)),)
		$(error $(LOCAL_PATH): invalid LOCAL_JACK_ENABLED "$(LOCAL_JACK_ENABLED)" for $(LOCAL_MODULE))
		endif
		endif
		LOCAL_JACK_ENABLED :=
		endif
		endif

		ifdef $(LOCAL_MODULE).JACK_VERSION
		LOCAL_JACK_VERSION := $($(LOCAL_MODULE).JACK_VERSION)

core/definitions.mk

+1 −26

Original line number	Diff line number	Diff line
		@@ -2043,9 +2043,8 @@ fi
		$(hide) tr ' ' '\n' < $@.java-source-list \
		\| sort -u > $@.java-source-list-uniq
		$(hide) if [ -s $@.java-source-list-uniq ] ; then \
		$(call call-jack,$(PRIVATE_JACK_EXTRA_ARGS)) \
		$(call call-jack) \
		$(strip $(PRIVATE_JACK_FLAGS)) \
		$(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \
		$(addprefix --classpath ,$(strip \
		$(call normalize-path-list,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES)) $(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \
		-D jack.import.resource.policy=keep-first \
		@@ -2214,17 +2213,6 @@ define create-empty-package
		$(call create-empty-package-at,$@)
		endef

		# Copy an arhchive file and delete any class files and empty folders inside.
		# $(1): the source archive file.
		# $(2): the destination archive file.
		define initialize-package-file
		@mkdir -p $(dir $(2))
		$(hide) cp -f $(1) $(2)
		$(hide) zip -qd $(2) "*.class" \
		$(if $(strip $(PRIVATE_DONT_DELETE_JAR_DIRS)),,"*/") \
		\|\| true # Ignore the error when nothing to delete.
		endef

		#TODO: we kinda want to build different asset packages for
		# different configurations, then combine them later (or something).
		# Per-locale, etc.
		@@ -2372,19 +2360,6 @@ $(hide) if unzip -l $@ $(PRIVATE_EMBEDDED_JNI_LIBS) >/dev/null ; then \
		fi
		endef

		define install-dex-debug
		$(hide) if [ -f "$(PRIVATE_INTERMEDIATES_DIR)/classes.dex" ]; then \
		mkdir -p $(TOP)/dalvik/DEBUG-FILES; \
		$(ACP) $(PRIVATE_INTERMEDIATES_DIR)/classes.dex \
		$(TOP)/dalvik/DEBUG-FILES/$(PRIVATE_MODULE).dex; \
		fi
		$(hide) if [ -f "$(PRIVATE_INTERMEDIATES_DIR)/classes.lst" ]; then \
		mkdir -p $(TOP)/dalvik/DEBUG-FILES; \
		$(ACP) $(PRIVATE_INTERMEDIATES_DIR)/classes.lst \
		$(TOP)/dalvik/DEBUG-FILES/$(PRIVATE_MODULE).lst; \
		fi
		endef

		# TODO(joeo): If we can ever upgrade to post 3.81 make and get the
		# new prebuilt rules to work, we should change this to copy the
		# resources to the out directory and then copy the resources.