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

Commit b4c49cba authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Compile using Jack. 

This allows to compile dex targeted java sources using Jack and Jill.
Default is still to compile with the legacy toolchain. Default can be
switched to the new toolchain by setting environement variable:
export ANDROID_COMPILE_WITH_JACK=true
Toolchain can also be forced for one module by defining
LOCAL_USE_JACK:=true # false
in the mk portion defining the module.

Jack execution environement can be controlled with:

Global variable ANDROID_JACK_VM allow to change the jvm executing Jack.
Global variable ANDROID_JACK_VM_ARGS allows to change default args given
to the jvm.
Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args
to give to Jack

LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for
the module.
LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack.

Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
parent 7fcb9209

core/base_rules.mk

+101 −1
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ endif # TARGET_ 
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_java_libs)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)



# full_java_libs: The list of files that should be used as the classpath.

#                 Using this list as a dependency list WILL NOT WORK.
@@ -417,7 +418,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja 
#                 be up-to-date.

ifdef LOCAL_IS_HOST_MODULE

ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-deps,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH := -bootclasspath $(call java-lib-files,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))



full_shared_java_libs := $(call java-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
@@ -678,6 +679,105 @@ $(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module) 
endif

endif



###########################################################

# JACK

###########################################################

ifeq ($(strip $(LOCAL_USE_JACK)),true)

ifdef need_compile_java



full_static_jack_libs := \

    $(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \

      $(call intermediates-dir-for, \

        JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),COMMON)/classes.jack)



ifeq ($(my_prefix),TARGET_)

ifeq ($(LOCAL_SDK_VERSION),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES := $(call jack-lib-files,core-libart)

else

ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)

# LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES := $(call jack-lib-files,android_stubs_current)

else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES := $(call jack-lib-files,android_system_stubs_current)

else

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES := $(call jack-lib-files,sdk_v$(LOCAL_SDK_VERSION))

endif # current or system_current

endif # LOCAL_SDK_VERSION

endif # TARGET_



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)

ifneq ($(ANDROID_JACK_VM_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(ANDROID_JACK_VM_ARGS)

endif

ifneq ($(LOCAL_JACK_VM_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM_ARGS := $(LOCAL_JACK_VM_ARGS)

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)

ifneq ($(ANDROID_JACK_EXTRA_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)

endif

ifneq ($(LOCAL_JACK_EXTRA_ARGS),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_EXTRA_ARGS := $(LOCAL_JACK_EXTRA_ARGS)

endif



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM := $(DEFAULT_JACK_VM)

ifneq ($(strip $(ANDROID_JACK_VM)),)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VM := $(ANDROID_JACK_VM)

endif



ifdef LOCAL_IS_HOST_MODULE

ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES := $(call jack-lib-files,core-libart-hostdex,$(LOCAL_IS_HOST_MODULE))

full_shared_jack_libs := $(call jack-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

full_jack_lib_deps := $(call jack-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

else

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES :=

full_shared_jack_libs := $(call jack-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

full_jack_lib_deps := $(full_shared_jack_libs)

endif # USE_CORE_LIB_BOOTCLASSPATH

else # !LOCAL_IS_HOST_MODULE

full_shared_jack_libs := $(call jack-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

full_jack_lib_deps := $(call jack-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))

endif # !LOCAL_IS_HOST_MODULE

full_jack_libs := $(full_shared_jack_libs) $(full_static_jack_libs) $(LOCAL_JACK_CLASSPATH)

full_jack_lib_deps += $(full_static_jack_libs) $(LOCAL_JACK_CLASSPATH)



# This is set by packages that are linking to other packages that export

# shared libraries, allowing them to make use of the code in the linked apk.

ifneq ($(apk_libraries),)

  link_apk_jack_libraries := \

      $(foreach lib,$(apk_libraries), \

        $(call intermediates-dir-for, \

              APPS,$(lib),,COMMON)/classes.jack)



  # link against the jar with full original names (before proguard processing).

  full_shared_jack_libs += $(link_apk_jack_libraries)

  full_jack_libs += $(link_apk_jack_libraries)

  full_jack_lib_deps += $(link_apk_jack_libraries)

endif



# This is set by packages that contain instrumentation, allowing them to

# link against the package they are instrumenting.  Currently only one such

# package is allowed.

ifdef LOCAL_INSTRUMENTATION_FOR



   # link against the jar with full original names (before proguard processing).

   link_instr_classes_jack := $(link_instr_intermediates_dir.COMMON)/classes.noshrob.jack

   full_jack_libs += $(link_instr_classes_jack)

   full_jack_lib_deps += $(link_instr_classes_jack)

endif



endif  # need_compile_java



# Propagate local configuration options to this target.

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_ALL_JACK_LIBRARIES:= $(full_jack_libs)

$(LOCAL_INTERMEDIATE_TARGETS) : PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)



endif # LOCAL_USE_JACK



###########################################################

## NOTICE files

###########################################################

core/clear_vars.mk

+6 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ LOCAL_JAVA_LIBRARIES:= 
LOCAL_JAVA_LAYERS_FILE:=

LOCAL_NO_STANDARD_LIBRARIES:=

LOCAL_CLASSPATH:=

LOCAL_JACK_CLASSPATH:=

LOCAL_DROIDDOC_USE_STANDARD_DOCLET:=

LOCAL_DROIDDOC_SOURCE_PATH:=

LOCAL_DROIDDOC_TEMPLATE_DIR:=
@@ -105,6 +106,10 @@ LOCAL_JARJAR_RULES:= 
LOCAL_ADDITIONAL_JAVA_DIR:=

LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_DX_FLAGS:=

LOCAL_USE_JACK:=$(ANDROID_COMPILE_WITH_JACK)

LOCAL_JACK_VM_ARGS :=

LOCAL_JACK_EXTRA_ARGS :=

LOCAL_JACK_FLAGS:=

LOCAL_CERTIFICATE:=

LOCAL_SDK_VERSION:=

LOCAL_SDK_RES_VERSION:=
@@ -112,6 +117,7 @@ LOCAL_NDK_STL_VARIANT:= 
LOCAL_EMMA_INSTRUMENT:=

LOCAL_PROGUARD_ENABLED:= # '',full,custom,nosystem,disabled,obfuscation,optimization

LOCAL_PROGUARD_FLAGS:=

LOCAL_JACK_PROGUARD_FLAGS:=

LOCAL_PROGUARD_FLAG_FILES:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=

LOCAL_EMMA_COVERAGE_FILTER:=

core/config.mk

+15 −0
Original line number Diff line number Diff line
@@ -365,6 +365,9 @@ endif 


# ---------------------------------------------------------------

# Generic tools.

JACK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack.jar

JILL_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jill.jar

JACK_MULTIDEX_DEFAULT_PREPROCESSOR := frameworks/multidex/library/resources/JACK-INF/legacyMultidexInstallation.jpp



LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39

# The default PKGDATADIR built in the prebuilt bison is a relative path
@@ -404,6 +407,18 @@ MKTARBALL := build/tools/mktarball.sh 
TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)

E2FSCK := $(HOST_OUT_EXECUTABLES)/e2fsck$(HOST_EXECUTABLE_SUFFIX)

JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

# call jack

#

# $(1): vm

# $(2): vm arguments

# $(3): jack perf arguments

define call-jack

$(1) $(2) -cp $(JACK_JAR) com.android.jack.Main $(3)

endef

DEFAULT_JACK_VM := java

DEFAULT_JACK_VM_ARGS := -Dfile.encoding=UTF-8 -Xmx3584m -Xms2560m -XX:+TieredCompilation

DEFAULT_JACK_EXTRA_ARGS := -D sched.runner=single-threaded --sanity-checks off

JILL := java -Xmx3500m -cp $(JILL_JAR) com.android.jill.Main

PROGUARD := external/proguard/bin/proguard.sh

JAVATAGS := build/tools/java-event-log-tags.py

LLVM_RS_CC := $(HOST_OUT_EXECUTABLES)/llvm-rs-cc$(HOST_EXECUTABLE_SUFFIX)

core/definitions.mk

+169 −1
Original line number Diff line number Diff line
@@ -402,6 +402,14 @@ define add-dependency 
$(1): $(2)

endef



###########################################################

## Reverse order of a list

###########################################################



define reverse-list

$(if $(1),$(call reverse-list,$(wordlist 2,$(words $(1)),$(1)))) $(firstword $(1))

endef



###########################################################

## The intermediates directory.  Where object files go for

## a given target.  We could technically get away without
@@ -592,7 +600,7 @@ endef 
# $(1): library name

# $(2): Non-empty if IS_HOST_MODULE

define _java-lib-full-dep

$(call _java-lib-dir,$(1),$(2))/$(if $(2),javalib,classes)$(COMMON_JAVA_PACKAGE_SUFFIX)

$(call _java-lib-dir,$(1),$(2))/$(if $(2),javalib,classes)$(COMMON_JAVA_PACKAGE_SUFFIX) $(call _java-lib-full-classes.jar,$(lib),$(2))

endef



# $(1): library name list
@@ -601,6 +609,36 @@ define java-lib-deps 
$(foreach lib,$(1),$(call _java-lib-full-dep,$(lib),$(2)))

endef



###########################################################

## Convert "core ext framework" to "out/.../classes.jack ..."

## $(1): library list

## $(2): Non-empty if IS_HOST_MODULE

###########################################################



# $(1): library name

# $(2): Non-empty if IS_HOST_MODULE

define _jack-lib-full-classes

$(call _java-lib-dir,$(1),$(2))/classes.jack

endef



# $(1): library name list

# $(2): Non-empty if IS_HOST_MODULE

define jack-lib-files

$(foreach lib,$(1),$(call _jack-lib-full-classes,$(lib),$(2)))

endef



# $(1): library name

# $(2): Non-empty if IS_HOST_MODULE

define _jack-lib-full-dep

$(call _jack-lib-full-classes,$(1),$(2))

endef



# $(1): library name list

# $(2): Non-empty if IS_HOST_MODULE

define jack-lib-deps

$(foreach lib,$(1),$(call _jack-lib-full-dep,$(lib),$(2)))

endef



###########################################################

## Run rot13 on a string

## $(1): the string.  Must be one line.
@@ -1647,6 +1685,122 @@ define transform-java-to-classes.jar 
$(call compile-java,$(TARGET_JAVAC),$(PRIVATE_BOOTCLASSPATH))

endef



# Invoke Jack to compile java from source to dex and jack files.

#

# Some historical notes:

# - below we write the list of java files to java-source-list to avoid argument

#   list length problems with Cygwin

# - we filter out duplicate java file names because Jack doesn't like them.

# TODO (yroussel) PRIVATE_RMTYPEDEFS

define jack-java-to-dex

$(hide) rm -f $@

$(hide) rm -f $(PRIVATE_CLASSES_JACK)

$(hide) rm -rf $(PRIVATE_JACK_INTERMEDIATES_DIR)

$(hide) mkdir -p $(dir $@)

$(hide) mkdir -p $(dir $(PRIVATE_CLASSES_JACK))

$(hide) mkdir -p $(PRIVATE_JACK_INTERMEDIATES_DIR)

# TODO unzip only resources?

$(call unzip-jar-files,$(PRIVATE_STATIC_JACK_LIBRARIES),$(PRIVATE_JACK_INTERMEDIATES_DIR))

$(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list)

$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \

          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \

fi

$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \

    | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq

$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \

    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \

)

$(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    export tmpEcjArg="@$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq"; \

else \

    export tmpEcjArg=""; \

fi; \

$(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \

    $(addprefix --classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \

    $(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \

    -D jack.import.resource.policy=keep-first \

    -D jack.import.jackfile.policy=keep-first \

    --output-jack $(PRIVATE_CLASSES_JACK) \

    -D jack.java.source.version=1.7 \

    --output-dex $(dir $@) \

    $(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \

    $(if $(PRIVATE_JACK_PROGUARD_FLAGS),--config-proguard $@.flags) \

    $$tmpEcjArg \

    || ( rm -rf $(PRIVATE_JACK_INTERMEDIATES_DIR); rm -f $@; exit 41 )

$(call unzip-jar-files,$(PRIVATE_CLASSES_JACK),$(PRIVATE_JACK_INTERMEDIATES_DIR))

$(hide) rm -f $(PRIVATE_CLASSES_JACK)

$(hide) rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list

$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq $(PRIVATE_JACK_INTERMEDIATES_DIR).java-source-list

$(if $(PRIVATE_JAR_PACKAGES), $(hide) echo unsupported options PRIVATE_JAR_PACKAGES in $@; exit 53)

$(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) echo unsupported options JAR_EXCLUDE_PACKAGES in $@; exit 53)

$(if $(PRIVATE_JAR_MANIFEST), \

    $(hide) sed -e 's/%BUILD_NUMBER%/$(BUILD_NUMBER)/' \

            $(PRIVATE_JAR_MANIFEST) > $(dir $(PRIVATE_CLASSES_JACK))/manifest.mf && \

        jar -cfm $(PRIVATE_CLASSES_JACK) $(dir $@)/manifest.mf \

            -C $(PRIVATE_JACK_INTERMEDIATES_DIR) ., \

    $(hide) jar -cf $(PRIVATE_CLASSES_JACK) -C $(PRIVATE_JACK_INTERMEDIATES_DIR) .)

endef



define transform-jar-to-jack

	$(hide) mkdir -p $(dir $@)

	$(JILL) --output $@ $<

endef





# Invoke Jack to compile java from source to jack files without shrink or obfuscation.

#

# Some historical notes:

# - below we write the list of java files to java-source-list to avoid argument

#   list length problems with Cygwin

# - we filter out duplicate java file names because Jack doesn't like them.

define java-to-jack

$(hide) rm -f $@

$(hide) rm -rf $(PRIVATE_JACK_INTERMEDIATES_DIR)

$(hide) mkdir -p $(dir $@)

$(hide) mkdir -p $(PRIVATE_JACK_INTERMEDIATES_DIR)

$(call dump-words-to-file,$(PRIVATE_JAVA_SOURCES),$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list)

$(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \

          find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java' >> $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list; \

fi

$(hide) tr ' ' '\n' < $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list \

    | sort -u > $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq

$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \

    $(hide) echo -basedirectory $(CURDIR) > $@.flags; \

    echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \

)

$(hide) if [ -s $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    export tmpEcjArg="@$(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq"; \

else \

    export tmpEcjArg=""; \

fi; \

$(call call-jack,$(PRIVATE_JACK_VM),$(PRIVATE_JACK_VM_ARGS),$(PRIVATE_JACK_EXTRA_ARGS)) \

    $(strip $(PRIVATE_JACK_FLAGS)) \

    $(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \

    $(if $(NO_OPTIMIZE_DX), \

        -D jack.dex.optimize="false") \

    $(addprefix --classpath ,$(strip \

        $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH_JAVA_LIBRARIES) $(PRIVATE_ALL_JACK_LIBRARIES)))) \

    $(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \

    -D jack.import.resource.policy=keep-first \

    -D jack.import.jackfile.policy=keep-first \

    -D jack.java.source.version=1.7 \

    --output-jack $@ \

    $(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \

    $(if $(PRIVATE_JACK_PROGUARD_FLAGS),--config-proguard $@.flags) \

    $$tmpEcjArg \

    || ( echo rm -rf $(PRIVATE_JACK_INTERMEDIATES_DIR); rm -f $@ ; exit 41 )

$(hide) echo rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list

$(hide) echo rm -f $(PRIVATE_JACK_INTERMEDIATES_DIR)/java-source-list-uniq

$(if $(PRIVATE_JAR_PACKAGES), $(hide) echo unsupported options PRIVATE_JAR_PACKAGES in $@; exit 53)

$(if $(PRIVATE_JAR_EXCLUDE_PACKAGES), $(hide) echo unsupported options JAR_EXCLUDE_PACKAGES in $@; exit 53)

endef



# Override the above definitions if we want to do incremetal javac

ifeq (true, $(ENABLE_INCREMENTALJAVAC))

define compile-java
@@ -1818,6 +1972,20 @@ $(hide) if [ -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) ] ; then \ 
fi

endef



# Add resources carried by static Jack libraries.

#

define add-carried-jack-resources

 $(hide) if [ -d $(PRIVATE_JACK_INTERMEDIATES_DIR) ] ; then \

    jack_res_jar_flags=$$(find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f -a -not -name "*.jayce" \

        | sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C $(PRIVATE_JACK_INTERMEDIATES_DIR) ?"); \

    if [ -n "$$jack_res_jar_flags" ] ; then \

        echo $$jack_res_jar_flags >$(dir $@)jack_res_jar_flags; \

        jar uf $@ $$jack_res_jar_flags; \

    fi; \

fi

endef





# Sign a package using the specified key/cert.

#

define sign-package

core/host_dalvik_java_library.mk

+30 −0
Original line number Diff line number Diff line
@@ -33,11 +33,13 @@ endif 
full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar

full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar

full_classes_jar := $(intermediates.COMMON)/classes.jar

full_classes_jack := $(intermediates.COMMON)/classes.jack

built_dex := $(intermediates.COMMON)/classes.dex



LOCAL_INTERMEDIATE_TARGETS += \

    $(full_classes_compiled_jar) \

    $(full_classes_jarjar_jar) \

    $(full_classes_jack) \

    $(full_classes_jar) \

    $(built_dex)
@@ -95,6 +97,7 @@ $(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP) 
	@echo Copying: $@

	$(hide) $(ACP) -fp $< $@



ifneq ($(strip $(LOCAL_USE_JACK)),true)

$(built_dex): PRIVATE_INTERMEDIATES_DIR := $(intermediates.COMMON)

$(built_dex): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)

$(built_dex): $(full_classes_jar) $(DX)
@@ -110,4 +113,31 @@ ifneq ($(extra_jar_args),) 
	$(add-java-resources-to-package)

endif



else # LOCAL_USE_JACK

$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jayces

$(LOCAL_INTERMEDIATE_TARGETS):  PRIVATE_JACK_DEBUG_FLAGS := -g



$(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)

$(built_dex): PRIVATE_JACK_FLAGS := $(LOCAL_JACK_FLAGS)

$(built_dex): $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \

        $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_MODULE_MAKEFILE) \

        $(LOCAL_MODULE_MAKEFILE) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_JAR)

	@echo Building with Jack: $@

	$(jack-java-to-dex)



$(full_classes_jack): $(built_dex)



$(LOCAL_BUILT_MODULE): PRIVATE_DEX_FILE := $(built_dex)

$(LOCAL_BUILT_MODULE): $(built_dex) $(java_resource_sources)

	@echo "Host Jar: $(PRIVATE_MODULE) ($@)"

	$(create-empty-package)

	$(add-dex-to-package)

	$(add-carried-jack-resources)

ifneq ($(extra_jar_args),)

	$(add-java-resources-to-package)

endif



endif # LOCAL_USE_JACK



USE_CORE_LIB_BOOTCLASSPATH :=