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

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

[DO NOT MERGE] 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_JACK_ENABLED:=full # disabled, full, incremental
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.

This includes cherry-picks of the following changes:
b4c49cba
22c3fa6d
138768c1
5dd3e1d3
83d5d040
8bc90fd2
14027470
0fbc9ff2
833b427d
f9a27f45
28096669
37822c44
c6b44d43
d2a76c14
06744f60
95573d50
b8213916
2794e7b5
801f2c44
c76d99dc
f528e132
76a5e0bd
e25b3984 Partially, only Jack related parts werekept
ec46a3b7
abee3a9f
77cbe10f
daf07db4
b6bfb589

Ie all Jack related changes untill
b6bfb589
except
a96cc59a "Use Jack by default"

Change-Id: If9d47ef1c4fd1e6765ad2a47d816c1ad3cfab0e3
parent c3b58d4a

core/base_rules.mk

+83 −2
Original line number Original line Diff line number Diff line
@@ -418,10 +418,11 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja 
#                 be up-to-date.

#                 be up-to-date.

ifdef LOCAL_IS_HOST_MODULE

ifdef LOCAL_IS_HOST_MODULE

ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

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_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))

full_java_lib_deps := $(call java-lib-deps,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE)) \

    $(full_shared_java_libs)

else

else

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH :=

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_BOOTCLASSPATH :=
@@ -694,6 +695,86 @@ $(j_or_n)-$(h_or_t)-tests $(j_or_n)-tests $(h_or_t)-tests : $(my_checked_module) 
endif

endif

endif

endif





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

# JACK

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

ifdef LOCAL_JACK_ENABLED

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 := $(LOCAL_JACK_VM_ARGS)

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



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_JACK_ENABLED



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

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

## NOTICE files

## NOTICE files

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

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

core/cleanbuild.mk

+19 −0
Original line number Original line Diff line number Diff line
@@ -247,3 +247,22 @@ ifeq "$(force_installclean)" "true" 
  $(info *** Done with the cleaning, now starting the real build.)

  $(info *** Done with the cleaning, now starting the real build.)

endif

endif

force_installclean :=

force_installclean :=



.PHONY: clean-jack-files

clean-jack-files: clean-dex-files

	$(hide) find $(OUT_DIR) -name "*.jack" | xargs rm -f

	$(hide) find $(OUT_DIR) -type d -name "jack" | xargs rm -rf

	@echo "All jack files have been removed."



.PHONY: clean-dex-files

clean-dex-files:

	$(hide) find $(OUT_DIR) -name "*.dex" ! -path "*/jack-incremental/*" | xargs rm -f

	$(hide) for i in `find $(OUT_DIR) -name "*.jar" -o -name "*.apk"` ; do ((unzip -l $$i 2> /dev/null | \

				grep -q "\.dex$$" && rm -f $$i) || continue ) ; done

	@echo "All dex files and archives containing dex files have been removed."



.PHONY: clean-jack-incremental

clean-jack-incremental:

	$(hide) find $(OUT_DIR) -name "jack-incremental" -type d | xargs rm -rf

	@echo "All jack incremental dirs have been removed."

core/clear_vars.mk

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

LOCAL_JAVA_LAYERS_FILE:=

LOCAL_NO_STANDARD_LIBRARIES:=

LOCAL_NO_STANDARD_LIBRARIES:=

LOCAL_CLASSPATH:=

LOCAL_CLASSPATH:=

LOCAL_JACK_CLASSPATH:=

LOCAL_DROIDDOC_USE_STANDARD_DOCLET:=

LOCAL_DROIDDOC_USE_STANDARD_DOCLET:=

LOCAL_DROIDDOC_SOURCE_PATH:=

LOCAL_DROIDDOC_SOURCE_PATH:=

LOCAL_DROIDDOC_TEMPLATE_DIR:=

LOCAL_DROIDDOC_TEMPLATE_DIR:=
@@ -107,6 +108,11 @@ LOCAL_JARJAR_RULES:= 
LOCAL_ADDITIONAL_JAVA_DIR:=

LOCAL_ADDITIONAL_JAVA_DIR:=

LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_DX_FLAGS:=

LOCAL_DX_FLAGS:=

LOCAL_JACK_ENABLED:=$(DEFAULT_JACK_ENABLED) # '' (ie disabled), disabled, full, incremental

LOCAL_JACK_VM_ARGS := $(DEFAULT_JACK_VM_ARGS)

LOCAL_JACK_EXTRA_ARGS := $(DEFAULT_JACK_EXTRA_ARGS)

LOCAL_JACK_FLAGS:=

LOCAL_JILL_FLAGS:=

LOCAL_CERTIFICATE:=

LOCAL_CERTIFICATE:=

LOCAL_SDK_VERSION:=

LOCAL_SDK_VERSION:=

LOCAL_SDK_RES_VERSION:=

LOCAL_SDK_RES_VERSION:=
@@ -114,6 +120,7 @@ LOCAL_NDK_STL_VARIANT:= 
LOCAL_EMMA_INSTRUMENT:=

LOCAL_EMMA_INSTRUMENT:=

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

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

LOCAL_PROGUARD_FLAGS:=

LOCAL_PROGUARD_FLAGS:=

LOCAL_JACK_PROGUARD_FLAGS:=

LOCAL_PROGUARD_FLAG_FILES:=

LOCAL_PROGUARD_FLAG_FILES:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=

LOCAL_TEST_MODULE_TO_PROGUARD_WITH:=

LOCAL_EMMA_COVERAGE_FILTER:=

LOCAL_EMMA_COVERAGE_FILTER:=

core/config.mk

+47 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,12 @@ COMMON_ANDROID_PACKAGE_SUFFIX := .apk 
# list of flags to turn specific warnings in to errors

# list of flags to turn specific warnings in to errors

TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point

TARGET_ERROR_FLAGS := -Werror=return-type -Werror=non-virtual-dtor -Werror=address -Werror=sequence-point





ifdef TMPDIR

JAVA_TMPDIR_ARG := -Djava.io.tmpdir=$(TMPDIR)

else

JAVA_TMPDIR_ARG :=

endif



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

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

# Include sub-configuration files

# Include sub-configuration files

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

# ###############################################################
@@ -365,6 +371,11 @@ endif 




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

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

# Generic tools.

# Generic tools.

JACK := $(HOST_OUT_EXECUTABLES)/jack

JACK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack.jar

JACK_LAUNCHER_JAR := $(HOST_OUT_JAVA_LIBRARIES)/jack-launcher.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

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

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

TUNE2FS := $(HOST_OUT_EXECUTABLES)/tune2fs$(HOST_EXECUTABLE_SUFFIX)

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

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

JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar

JARJAR := $(HOST_OUT_JAVA_LIBRARIES)/jarjar.jar



ifeq ($(ANDROID_COMPILE_WITH_JACK),true)

DEFAULT_JACK_ENABLED:=full

else

DEFAULT_JACK_ENABLED:=

endif

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

JACK_VM := $(ANDROID_JACK_VM)

else

JACK_VM := java

endif

# call jack

#

# $(1): vm arguments

# $(2): jack perf arguments

ifneq (,$(strip $(filter dist,$(MAKECMDGOALS))))

JACK_SERVER_LOG_COMMAND := mkdir -p $(DIST_DIR)/logs/; SERVER_LOG=$(DIST_DIR)/logs/jack-server.log

endif

define call-jack

$(JACK_SERVER_LOG_COMMAND) JACK_VM_COMMAND="$(JACK_VM) $(1) $(JAVA_TMPDIR_ARG) -jar $(JACK_LAUNCHER_JAR) " JACK_JAR="$(JACK_JAR)" $(JACK) $(2)

endef

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

ifneq ($(ANDROID_JACK_VM_ARGS),)

DEFAULT_JACK_VM_ARGS := $(ANDROID_JACK_VM_ARGS)

else

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

endif

ifneq ($(ANDROID_JACK_EXTRA_ARGS),)

DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)

else

DEFAULT_JACK_EXTRA_ARGS := @$(BUILD_SYSTEM)/jack-default.args

endif

# Turn off jack warnings by default.

DEFAULT_JACK_EXTRA_ARGS += --verbose error



JILL := java -jar $(JILL_JAR)

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

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

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

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

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

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

core/configure_local_jack.mk

0 → 100644
+30 −0
Original line number Original line Diff line number Diff line 
#

# Copyright (C) 2008 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#



ifdef ANDROID_FORCE_JACK_ENABLED

LOCAL_JACK_ENABLED := $(ANDROID_FORCE_JACK_ENABLED)

endif

LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED))

ifneq ($(LOCAL_JACK_ENABLED),full)

ifneq ($(LOCAL_JACK_ENABLED),incremental)

ifdef LOCAL_JACK_ENABLED

ifneq ($(LOCAL_JACK_ENABLED),disabled)

$(error $(LOCAL_PATH): invalid LOCAL_JACK_ENABLED "$(LOCAL_JACK_ENABLED)" for $(LOCAL_MODULE))

endif

endif

LOCAL_JACK_ENABLED :=

endif

endif