Delete jack support
Remove all support for running jack.
Bug: 65302138
Test: m -j checkbuild
Change-Id: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
Merged-In: I1ef87c88af3f2689f8b0dcf1a01c958b16159631
(cherry picked from commit 5db5d31d73)
This commit is contained in:
Colin Cross
parent
a426e0e974
commit
e673deb280
20 changed files with 45 additions and 836 deletions
|
|
@ -2686,14 +2686,13 @@ $(APPS_ZIP): $(INSTALLED_SYSTEMIMAGE)
|
|||
fi
|
||||
|
||||
ifeq (true,$(EMMA_INSTRUMENT))
|
||||
#------------------------------------------------------------------
|
||||
# An archive of classes for use in generating code-coverage reports
|
||||
# These are the uninstrumented versions of any classes that were
|
||||
# to be instrumented.
|
||||
# Any dependencies are set up later in build/core/main.mk.
|
||||
#------------------------------------------------------------------
|
||||
# An archive of classes for use in generating code-coverage reports
|
||||
# These are the uninstrumented versions of any classes that were
|
||||
# to be instrumented.
|
||||
# Any dependencies are set up later in build/core/main.mk.
|
||||
|
||||
ifeq ($(ANDROID_COMPILE_WITH_JACK),false)
|
||||
JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar
|
||||
JACOCO_REPORT_CLASSES_ALL := $(PRODUCT_OUT)/jacoco-report-classes-all.jar
|
||||
$(JACOCO_REPORT_CLASSES_ALL) :
|
||||
@echo "Collecting uninstrumented classes"
|
||||
$(hide) find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "jacoco-report-classes.jar" | \
|
||||
|
|
@ -2704,14 +2703,6 @@ $(JACOCO_REPORT_CLASSES_ALL) :
|
|||
# -q supress most output
|
||||
# -X skip storing extended file attributes
|
||||
|
||||
else
|
||||
EMMA_META_ZIP := $(PRODUCT_OUT)/emma_meta.zip
|
||||
$(EMMA_META_ZIP) :
|
||||
@echo "Collecting Emma coverage meta files."
|
||||
$(hide) find $(TARGET_COMMON_OUT_ROOT) $(HOST_COMMON_OUT_ROOT) -name "coverage.em" | \
|
||||
zip -@ -qX $@
|
||||
endif
|
||||
|
||||
endif # EMMA_INSTRUMENT=true
|
||||
|
||||
|
||||
|
|
@ -2724,7 +2715,7 @@ PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_
|
|||
# the dependency will be set up later in build/core/main.mk.
|
||||
$(PROGUARD_DICT_ZIP) :
|
||||
@echo "Packaging Proguard obfuscation dictionary files."
|
||||
$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary -o -name jack_dictionary`; \
|
||||
$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \
|
||||
if [ -n "$$dict_files" ]; then \
|
||||
unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \
|
||||
zip -qX $@ $$dict_files $$unobfuscated_jars; \
|
||||
|
|
@ -2907,7 +2898,6 @@ $(INTERNAL_SDK_TARGET): $(deps)
|
|||
-v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \
|
||||
-v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \
|
||||
-v "FONT_OUT=$(SDK_FONT_TEMP)" \
|
||||
-v "JACK_SDKTOOL_VERSION=$(JACK_SDKTOOL_VERSION)" \
|
||||
-o $(PRIVATE_DIR) && \
|
||||
cp -f $(target_notice_file_txt) \
|
||||
$(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \
|
||||
|
|
|
|||
|
|
@ -574,7 +574,6 @@ ZIPTIME := $(prebuilt_build_tools_bin)/ziptime
|
|||
|
||||
# ---------------------------------------------------------------
|
||||
# Generic tools.
|
||||
JACK := $(HOST_OUT_EXECUTABLES)/jack
|
||||
|
||||
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
|
||||
|
|
@ -645,19 +644,6 @@ DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar
|
|||
FAT16COPY := build/tools/fat16copy.py
|
||||
CHECK_LINK_TYPE := build/tools/check_link_type.py
|
||||
|
||||
ifeq ($(ANDROID_COMPILE_WITH_JACK),true)
|
||||
DEFAULT_JACK_ENABLED:=full
|
||||
else
|
||||
DEFAULT_JACK_ENABLED:=
|
||||
endif
|
||||
ifneq ($(ANDROID_JACK_EXTRA_ARGS),)
|
||||
JACK_DEFAULT_ARGS :=
|
||||
DEFAULT_JACK_EXTRA_ARGS := $(ANDROID_JACK_EXTRA_ARGS)
|
||||
else
|
||||
JACK_DEFAULT_ARGS := $(BUILD_SYSTEM)/jack-default.args
|
||||
DEFAULT_JACK_EXTRA_ARGS := @$(JACK_DEFAULT_ARGS)
|
||||
endif
|
||||
|
||||
TURBINE := $(HOST_OUT_JAVA_LIBRARIES)/turbine$(COMMON_JAVA_PACKAGE_SUFFIX)
|
||||
PROGUARD := external/proguard/bin/proguard.sh
|
||||
JAVATAGS := build/tools/java-event-log-tags.py
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
#
|
||||
# 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
|
||||
|
||||
ifneq ($(ANDROID_COMPILE_WITH_JACK),true)
|
||||
LOCAL_JACK_ENABLED :=
|
||||
endif
|
||||
|
||||
LOCAL_JACK_ENABLED := $(strip $(LOCAL_JACK_ENABLED))
|
||||
LOCAL_MODULE := $(strip $(LOCAL_MODULE))
|
||||
|
||||
valid_jack_enabled_values := full incremental javac_frontend disabled
|
||||
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifneq ($(LOCAL_JACK_ENABLED),$(filter $(firstword $(LOCAL_JACK_ENABLED)),$(valid_jack_enabled_values)))
|
||||
$(error $(LOCAL_PATH): invalid LOCAL_JACK_ENABLED "$(LOCAL_JACK_ENABLED)" for $(LOCAL_MODULE))
|
||||
endif
|
||||
|
||||
ifeq ($(LOCAL_JACK_ENABLED),disabled)
|
||||
LOCAL_JACK_ENABLED :=
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef $(LOCAL_MODULE).JACK_VERSION
|
||||
LOCAL_JACK_VERSION := $($(LOCAL_MODULE).JACK_VERSION)
|
||||
else
|
||||
LOCAL_JACK_VERSION := $(JACK_DEFAULT_VERSION)
|
||||
endif
|
||||
|
|
@ -725,18 +725,6 @@ $(call app-lib-files,$(1))
|
|||
endef
|
||||
endif
|
||||
|
||||
###########################################################
|
||||
## Convert "core ext framework" to "out/.../classes.jack ..."
|
||||
## $(1): library list
|
||||
## $(2): Non-empty if IS_HOST_MODULE
|
||||
###########################################################
|
||||
|
||||
# $(1): library name list
|
||||
# $(2): Non-empty if IS_HOST_MODULE
|
||||
define jack-lib-files
|
||||
$(foreach lib,$(1),$(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),$(2),COMMON)/classes.jack)
|
||||
endef
|
||||
|
||||
###########################################################
|
||||
## Returns true if $(1) and $(2) are equal. Returns
|
||||
## the empty string if they are not equal.
|
||||
|
|
@ -2204,12 +2192,6 @@ define unzip-jar-files
|
|||
$(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF)
|
||||
endef
|
||||
|
||||
# Call jack
|
||||
#
|
||||
define call-jack
|
||||
JACK_VERSION=$(PRIVATE_JACK_VERSION) $(JACK) $(DEFAULT_JACK_EXTRA_ARGS)
|
||||
endef
|
||||
|
||||
# Return jar arguments to compress files in a given directory
|
||||
# $(1): directory
|
||||
#
|
||||
|
|
@ -2310,106 +2292,6 @@ $(hide) $(ZIPTIME) $@.tmp
|
|||
$(hide) $(call commit-change-for-toc,$@)
|
||||
endef
|
||||
|
||||
# Invoke Jack to compile java from source to dex and jack files.
|
||||
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)
|
||||
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),$(hide) mkdir -p $(PRIVATE_JACK_INCREMENTAL_DIR))
|
||||
$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \
|
||||
$(hide) echo -basedirectory $(CURDIR) > $@.flags; \
|
||||
echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \
|
||||
)
|
||||
$(if $(PRIVATE_EXTRA_JAR_ARGS),
|
||||
$(hide) mkdir -p $@.res.tmp
|
||||
$(hide) $(call create-empty-package-at,$@.res.tmp.zip)
|
||||
$(hide) $(call add-java-resources-to,$@.res.tmp.zip)
|
||||
$(hide) unzip -qo $@.res.tmp.zip -d $@.res.tmp
|
||||
$(hide) rm $@.res.tmp.zip)
|
||||
$(if $(PRIVATE_JACK_IMPORT_JAR),
|
||||
$(hide) mkdir -p $@.tmpjill.res
|
||||
$(hide) unzip -qo $(PRIVATE_JACK_IMPORT_JAR) -d $@.tmpjill.res
|
||||
$(hide) find $@.tmpjill.res -iname "*.class" -delete)
|
||||
$(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \
|
||||
export tmpEcjArg="@$(PRIVATE_JAVA_SOURCE_LIST)"; \
|
||||
else \
|
||||
export tmpEcjArg=""; \
|
||||
fi; \
|
||||
$(call call-jack) \
|
||||
$(strip $(PRIVATE_JACK_FLAGS)) \
|
||||
$(strip $(PRIVATE_JACK_COVERAGE_OPTIONS)) \
|
||||
$(if $(NO_OPTIMIZE_DX), \
|
||||
-D jack.dex.optimize="false") \
|
||||
$(if $(PRIVATE_RMTYPEDEFS), \
|
||||
-D jack.android.remove-typedef="true") \
|
||||
$(if $(PRIVATE_JACK_IMPORT_JAR), \
|
||||
--import $(PRIVATE_JACK_IMPORT_JAR) --import-resource $@.tmpjill.res) \
|
||||
$(addprefix --classpath ,$(strip \
|
||||
$(call normalize-path-list,$(PRIVATE_JACK_SHARED_LIBRARIES)))) \
|
||||
$(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \
|
||||
$(addprefix --pluginpath ,$(strip \
|
||||
$(call normalize-path-list,$(PRIVATE_JACK_PLUGIN_PATH)))) \
|
||||
$(if $(PRIVATE_JACK_PLUGIN),--plugin $(call normalize-comma-list,$(PRIVATE_JACK_PLUGIN))) \
|
||||
$(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \
|
||||
-D jack.android.min-api-level=$(PRIVATE_JACK_MIN_SDK_VERSION) \
|
||||
-D jack.import.resource.policy=keep-first \
|
||||
-D jack.import.type.policy=keep-first \
|
||||
--output-jack $(PRIVATE_CLASSES_JACK) \
|
||||
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \
|
||||
--output-dex $(PRIVATE_JACK_INTERMEDIATES_DIR) \
|
||||
$(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \
|
||||
$(if $(PRIVATE_JACK_PROGUARD_FLAGS),--config-proguard $@.flags) \
|
||||
$$tmpEcjArg \
|
||||
|| ( rm -rf $(PRIVATE_CLASSES_JACK); exit 41 )
|
||||
$(hide) mv $(PRIVATE_JACK_INTERMEDIATES_DIR)/classes*.dex $(dir $@)
|
||||
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(hide) rm -rf $@.res.tmp)
|
||||
$(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) echo unsupported options JAR_MANIFEST in $@; exit 53)
|
||||
endef
|
||||
|
||||
# Invoke Jack to compile java source just to check it compiles correctly.
|
||||
define jack-check-java
|
||||
$(hide) rm -f $@
|
||||
$(hide) mkdir -p $(dir $@)
|
||||
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),$(hide) mkdir -p $(PRIVATE_JACK_INCREMENTAL_DIR))
|
||||
$(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \
|
||||
$(call call-jack,$(PRIVATE_JACK_EXTRA_ARGS)) \
|
||||
$(strip $(PRIVATE_JACK_FLAGS)) \
|
||||
$(strip $(PRIVATE_JACK_DEBUG_FLAGS)) \
|
||||
$(addprefix --classpath ,$(strip \
|
||||
$(call normalize-path-list,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES)) $(PRIVATE_JACK_SHARED_LIBRARIES)))) \
|
||||
-D jack.import.resource.policy=keep-first \
|
||||
-D jack.android.min-api-level=$(PRIVATE_JACK_MIN_SDK_VERSION) \
|
||||
-D jack.import.type.policy=keep-first \
|
||||
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \
|
||||
@$(PRIVATE_JAVA_SOURCE_LIST); \
|
||||
fi
|
||||
touch $@
|
||||
endef
|
||||
|
||||
define transform-jar-to-jack
|
||||
$(hide) mkdir -p $(dir $@)
|
||||
$(hide) mkdir -p $@.tmpjill.res
|
||||
$(hide) unzip -qo $< -d $@.tmpjill.res
|
||||
$(hide) find $@.tmpjill.res -iname "*.class" -delete
|
||||
$(hide) $(call call-jack) \
|
||||
$(PRIVATE_JACK_FLAGS) \
|
||||
$(addprefix --pluginpath ,$(strip \
|
||||
$(call normalize-path-list,$(PRIVATE_JACK_PLUGIN_PATH)))) \
|
||||
$(if $(PRIVATE_JACK_PLUGIN),--plugin $(call normalize-comma-list,$(PRIVATE_JACK_PLUGIN))) \
|
||||
-D jack.import.resource.policy=keep-first \
|
||||
-D jack.import.type.policy=keep-first \
|
||||
-D jack.android.min-api-level=$(PRIVATE_JACK_MIN_SDK_VERSION) \
|
||||
--import $< \
|
||||
--import-resource $@.tmpjill.res \
|
||||
--output-jack $@
|
||||
$(hide) rm -rf $@.tmpjill.res
|
||||
endef
|
||||
|
||||
# Moves $1.tmp to $1 if necessary. This is designed to be used with
|
||||
# .KATI_RESTAT. For kati, this function doesn't update the timestamp
|
||||
# of $1 when $1.tmp is identical to $1 so that ninja won't rebuild
|
||||
|
|
@ -2451,54 +2333,6 @@ endef
|
|||
endif # TARGET_BUILD_APPS
|
||||
|
||||
|
||||
# Invoke Jack to compile java from source to jack files without shrink or obfuscation.
|
||||
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)
|
||||
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),$(hide) mkdir -p $(PRIVATE_JACK_INCREMENTAL_DIR))
|
||||
$(if $(PRIVATE_JACK_PROGUARD_FLAGS), \
|
||||
$(hide) echo -basedirectory $(CURDIR) > $@.flags; \
|
||||
echo $(PRIVATE_JACK_PROGUARD_FLAGS) >> $@.flags; \
|
||||
)
|
||||
$(if $(PRIVATE_EXTRA_JAR_ARGS),
|
||||
$(hide) mkdir -p $@.res.tmp
|
||||
$(hide) $(call create-empty-package-at,$@.res.tmp.zip)
|
||||
$(hide) $(call add-java-resources-to,$@.res.tmp.zip)
|
||||
$(hide) unzip -qo $@.res.tmp.zip -d $@.res.tmp
|
||||
$(hide) rm $@.res.tmp.zip)
|
||||
$(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \
|
||||
export tmpEcjArg="@$(PRIVATE_JAVA_SOURCE_LIST)"; \
|
||||
else \
|
||||
export tmpEcjArg=""; \
|
||||
fi; \
|
||||
$(call call-jack) \
|
||||
$(strip $(PRIVATE_JACK_FLAGS)) \
|
||||
$(if $(NO_OPTIMIZE_DX), \
|
||||
-D jack.dex.optimize="false") \
|
||||
$(addprefix --classpath ,$(strip \
|
||||
$(call normalize-path-list,$(PRIVATE_JACK_SHARED_LIBRARIES)))) \
|
||||
$(addprefix --import ,$(call reverse-list,$(PRIVATE_STATIC_JACK_LIBRARIES))) \
|
||||
$(addprefix --pluginpath ,$(strip \
|
||||
$(call normalize-path-list,$(PRIVATE_JACK_PLUGIN_PATH)))) \
|
||||
$(if $(PRIVATE_JACK_PLUGIN),--plugin $(call normalize-comma-list,$(PRIVATE_JACK_PLUGIN))) \
|
||||
$(if $(PRIVATE_EXTRA_JAR_ARGS),--import-resource $@.res.tmp) \
|
||||
-D jack.import.resource.policy=keep-first \
|
||||
-D jack.import.type.policy=keep-first \
|
||||
-D jack.android.min-api-level=$(PRIVATE_JACK_MIN_SDK_VERSION) \
|
||||
$(if $(PRIVATE_JACK_INCREMENTAL_DIR),--incremental-folder $(PRIVATE_JACK_INCREMENTAL_DIR)) \
|
||||
--output-jack $@ \
|
||||
$(addprefix --config-jarjar ,$(strip $(PRIVATE_JARJAR_RULES))) \
|
||||
$(if $(PRIVATE_JACK_PROGUARD_FLAGS),--config-proguard $@.flags) \
|
||||
$$tmpEcjArg \
|
||||
|| ( rm -f $@ ; exit 41 )
|
||||
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(hide) rm -rf $@.res.tmp)
|
||||
$(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) echo unsupported options JAR_MANIFEST in $@; exit 53)
|
||||
endef
|
||||
|
||||
# Takes an sdk version that might be PLATFORM_VERSION_CODENAME (for example P),
|
||||
# returns a number greater than the highest existing sdk version if it is, or
|
||||
# the input if it is not.
|
||||
|
|
@ -2651,24 +2485,6 @@ $(hide) $(JAR) uf $(1) @$(1).jar-arg-list
|
|||
@rm -f $(1).jar-arg-list
|
||||
endef
|
||||
|
||||
# Add resources carried by static Jack libraries.
|
||||
#
|
||||
define add-carried-jack-resources
|
||||
$(call add-carried-jack-resources-to,$@)
|
||||
endef
|
||||
|
||||
# $(1) the target jar.
|
||||
define add-carried-jack-resources-to
|
||||
$(hide) if [ -d $(PRIVATE_JACK_INTERMEDIATES_DIR) ] ; then \
|
||||
find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f | sort \
|
||||
| sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C \"$(PRIVATE_JACK_INTERMEDIATES_DIR)\" \"?" -e "s/$$/\"/" \
|
||||
> $(dir $(1))jack_res_jar_flags; \
|
||||
if [ -s $(dir $(1))jack_res_jar_flags ] ; then \
|
||||
$(JAR) uf $(1) @$(dir $(1))jack_res_jar_flags; \
|
||||
fi; \
|
||||
fi
|
||||
endef
|
||||
|
||||
# Add resources (non .class files) from a jar to a package
|
||||
# $(1): the package file
|
||||
# $(2): the jar file
|
||||
|
|
|
|||
|
|
@ -34,12 +34,8 @@ $(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates)
|
|||
$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE :=
|
||||
ifneq ($(full_classes_jar),)
|
||||
$(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex)
|
||||
ifndef LOCAL_JACK_ENABLED
|
||||
# Use the jarjar processed arhive as the initial package file.
|
||||
$(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar)
|
||||
else
|
||||
$(built_dpi_apk): PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
$(built_dpi_apk): $(built_dex)
|
||||
else
|
||||
$(built_dpi_apk): PRIVATE_DEX_FILE :=
|
||||
|
|
@ -64,9 +60,6 @@ ifeq ($(full_classes_jar),)
|
|||
$(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@))
|
||||
else
|
||||
$(add-dex-to-package)
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(add-carried-jack-resources)
|
||||
endif
|
||||
endif
|
||||
$(sign-package)
|
||||
|
||||
|
|
|
|||
|
|
@ -24,19 +24,9 @@ $(call record-module-type,HOST_DALVIK_JAVA_LIBRARY)
|
|||
ifeq ($(HOST_OS),linux)
|
||||
USE_CORE_LIB_BOOTCLASSPATH := true
|
||||
|
||||
#################################
|
||||
include $(BUILD_SYSTEM)/configure_local_jack.mk
|
||||
#################################
|
||||
|
||||
#######################################
|
||||
include $(BUILD_SYSTEM)/host_java_library_common.mk
|
||||
#######################################
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
|
||||
# For static library, $(LOCAL_BUILT_MODULE) is $(full_classes_jack).
|
||||
LOCAL_BUILT_MODULE_STEM := classes.jack
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
||||
LOCAL_JAVA_LIBRARIES := core-oj-hostdex core-libart-hostdex $(LOCAL_JAVA_LIBRARIES)
|
||||
|
|
@ -50,8 +40,6 @@ full_classes_combined_jar := $(intermediates.COMMON)/classes-combined.jar
|
|||
full_classes_desugar_jar := $(intermediates.COMMON)/desugar.classes.jar
|
||||
full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar
|
||||
full_classes_jar := $(intermediates.COMMON)/classes.jar
|
||||
full_classes_jack := $(intermediates.COMMON)/classes.jack
|
||||
jack_check_timestamp := $(intermediates.COMMON)/jack.check.timestamp
|
||||
built_dex := $(intermediates.COMMON)/classes.dex
|
||||
java_source_list_file := $(intermediates.COMMON)/java-source-list
|
||||
|
||||
|
|
@ -61,24 +49,18 @@ LOCAL_INTERMEDIATE_TARGETS += \
|
|||
$(full_classes_combined_jar) \
|
||||
$(full_classes_desugar_jar) \
|
||||
$(full_classes_jarjar_jar) \
|
||||
$(full_classes_jack) \
|
||||
$(full_classes_jar) \
|
||||
$(jack_check_timestamp) \
|
||||
$(built_dex) \
|
||||
$(java_source_list_file)
|
||||
|
||||
# See comment in java.mk
|
||||
ifndef LOCAL_CHECKED_MODULE
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
LOCAL_CHECKED_MODULE := $(jack_check_timestamp)
|
||||
else
|
||||
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
|
||||
LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)
|
||||
else
|
||||
LOCAL_CHECKED_MODULE := $(built_dex)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#######################################
|
||||
include $(BUILD_SYSTEM)/base_rules.mk
|
||||
|
|
@ -101,8 +83,6 @@ java_sources_deps := \
|
|||
$(java_source_list_file): $(java_sources_deps)
|
||||
$(write-java-source-list)
|
||||
|
||||
ifndef LOCAL_JACK_ENABLED
|
||||
|
||||
$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)
|
||||
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)
|
||||
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=
|
||||
|
|
@ -226,65 +206,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(my_default_ap
|
|||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(my_sdk_version)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MIN_SDK_VERSION := $(my_min_sdk_version)
|
||||
|
||||
else # LOCAL_JACK_ENABLED
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): \
|
||||
PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc
|
||||
|
||||
ifeq ($(LOCAL_JACK_ENABLED),incremental)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): \
|
||||
PRIVATE_JACK_INCREMENTAL_DIR := $(intermediates.COMMON)/jack-incremental
|
||||
else
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): \
|
||||
PRIVATE_JACK_INCREMENTAL_DIR :=
|
||||
endif
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_FLAGS := -g $(LOCAL_JACK_FLAGS)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_MIN_SDK_VERSION := $(PLATFORM_JACK_MIN_SDK_VERSION)
|
||||
|
||||
jack_all_deps := \
|
||||
$(java_source_list_file) \
|
||||
$(java_sources_deps) \
|
||||
$(full_jack_deps) \
|
||||
$(jar_manifest_file) \
|
||||
$(NORMALIZE_PATH) \
|
||||
$(JACK_DEFAULT_ARGS) \
|
||||
$(JACK)
|
||||
|
||||
ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
|
||||
$(built_dex): PRIVATE_CLASSES_JACK := $(full_classes_jack)
|
||||
$(built_dex): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)
|
||||
$(built_dex): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)
|
||||
$(built_dex): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server
|
||||
@echo Building with Jack: $@
|
||||
$(jack-java-to-dex)
|
||||
|
||||
# $(full_classes_jack) is just by-product of $(built_dex).
|
||||
# The dummy command was added because, without it, make misses the fact the $(built_dex) also
|
||||
# change $(full_classes_jack).
|
||||
$(full_classes_jack): $(built_dex)
|
||||
$(hide) touch $@
|
||||
|
||||
$(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)
|
||||
|
||||
else # LOCAL_IS_STATIC_JAVA_LIBRARY
|
||||
$(full_classes_jack): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)
|
||||
$(full_classes_jack): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)
|
||||
$(full_classes_jack): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server
|
||||
@echo Building with Jack: $@
|
||||
$(java-to-jack)
|
||||
|
||||
endif # LOCAL_IS_STATIC_JAVA_LIBRARY
|
||||
|
||||
$(jack_check_timestamp): $(jack_all_deps) | setup-jack-server
|
||||
@echo Checking build with Jack: $@
|
||||
$(jack-check-java)
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
|
||||
USE_CORE_LIB_BOOTCLASSPATH :=
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
-D sched.runner=multi-threaded
|
||||
-D sched.runner.thread.kind=fixed
|
||||
-D sched.runner.thread.fixed.count=4
|
||||
--sanity-checks off
|
||||
-D jack.reporter.level.file=error=--,warning=-
|
||||
--verbose error
|
||||
-D jack.jayce.cache=false
|
||||
-D jack.lambda.grouping-scope=package
|
||||
-D jack.lambda.simplify-stateless=true
|
||||
|
|
@ -23,34 +23,32 @@ my_include_filter :=
|
|||
my_exclude_filter :=
|
||||
|
||||
ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
|
||||
ifeq ($(ANDROID_COMPILE_WITH_JACK),false)
|
||||
# determine Jacoco include/exclude filters
|
||||
DEFAULT_JACOCO_EXCLUDE_FILTER := org/junit/*,org/jacoco/*,org/mockito/*
|
||||
# copy filters from Jack but also skip some known java packages
|
||||
my_include_filter := $(strip $(LOCAL_JACK_COVERAGE_INCLUDE_FILTER))
|
||||
my_exclude_filter := $(strip $(DEFAULT_JACOCO_EXCLUDE_FILTER),$(LOCAL_JACK_COVERAGE_EXCLUDE_FILTER))
|
||||
# determine Jacoco include/exclude filters
|
||||
DEFAULT_JACOCO_EXCLUDE_FILTER := org/junit/*,org/jacoco/*,org/mockito/*
|
||||
# copy filters from Jack but also skip some known java packages
|
||||
my_include_filter := $(strip $(LOCAL_JACK_COVERAGE_INCLUDE_FILTER))
|
||||
my_exclude_filter := $(strip $(DEFAULT_JACOCO_EXCLUDE_FILTER),$(LOCAL_JACK_COVERAGE_EXCLUDE_FILTER))
|
||||
|
||||
# replace '.' with '/' and ',' with ' ', and quote each arg
|
||||
ifneq ($(strip $(my_include_filter)),)
|
||||
my_include_args := $(strip $(my_include_filter))
|
||||
# replace '.' with '/' and ',' with ' ', and quote each arg
|
||||
ifneq ($(strip $(my_include_filter)),)
|
||||
my_include_args := $(strip $(my_include_filter))
|
||||
|
||||
my_include_args := $(subst .,/,$(my_include_args))
|
||||
my_include_args := '$(subst $(comma),' ',$(my_include_args))'
|
||||
else
|
||||
my_include_args :=
|
||||
endif
|
||||
my_include_args := $(subst .,/,$(my_include_args))
|
||||
my_include_args := '$(subst $(comma),' ',$(my_include_args))'
|
||||
else
|
||||
my_include_args :=
|
||||
endif
|
||||
|
||||
# replace '.' with '/' and ',' with ' ', and quote each arg
|
||||
ifneq ($(strip $(my_exclude_filter)),)
|
||||
my_exclude_args := $(my_exclude_filter)
|
||||
# replace '.' with '/' and ',' with ' ', and quote each arg
|
||||
ifneq ($(strip $(my_exclude_filter)),)
|
||||
my_exclude_args := $(my_exclude_filter)
|
||||
|
||||
my_exclude_args := $(subst .,/,$(my_exclude_args))
|
||||
my_exclude_args := $(subst $(comma)$(comma),$(comma),$(my_exclude_args))
|
||||
my_exclude_args := '$(subst $(comma),' ', $(my_exclude_args))'
|
||||
else
|
||||
my_exclude_args :=
|
||||
endif
|
||||
endif # ANDROID_COMPILE_WITH_JACK==false
|
||||
my_exclude_args := $(subst .,/,$(my_exclude_args))
|
||||
my_exclude_args := $(subst $(comma)$(comma),$(comma),$(my_exclude_args))
|
||||
my_exclude_args := '$(subst $(comma),' ', $(my_exclude_args))'
|
||||
else
|
||||
my_exclude_args :=
|
||||
endif
|
||||
endif # LOCAL_EMMA_INSTRUMENT == true
|
||||
|
||||
# determine whether to run the instrumenter based on whether there is any work
|
||||
|
|
|
|||
230
core/java.mk
230
core/java.mk
|
|
@ -31,55 +31,6 @@ ifneq ($(LOCAL_MODULE),jacocoagent)
|
|||
endif # !LOCAL_NO_STANDARD_LIBRARIES
|
||||
endif # LOCAL_MODULE == jacocoagent
|
||||
|
||||
# This duplicates the bootclasspath logic in java_common.mk because jack doesn't use
|
||||
# bootclasspath.
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifneq ($(LOCAL_SDK_VERSION),)
|
||||
ifeq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
||||
$(error $(LOCAL_PATH): Must not define both LOCAL_NO_STANDARD_LIBRARIES and LOCAL_SDK_VERSION)
|
||||
else
|
||||
ifeq ($(strip $(filter $(LOCAL_SDK_VERSION),$(TARGET_AVAILABLE_SDK_VERSIONS))),)
|
||||
$(error $(LOCAL_PATH): Invalid LOCAL_SDK_VERSION '$(LOCAL_SDK_VERSION)' \
|
||||
Choices are: $(TARGET_AVAILABLE_SDK_VERSIONS))
|
||||
else
|
||||
ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),current)
|
||||
# Use android_stubs_current if LOCAL_SDK_VERSION is current and no TARGET_BUILD_APPS.
|
||||
LOCAL_JAVA_LIBRARIES := android_stubs_current $(LOCAL_JAVA_LIBRARIES)
|
||||
else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),system_current)
|
||||
LOCAL_JAVA_LIBRARIES := android_system_stubs_current $(LOCAL_JAVA_LIBRARIES)
|
||||
else ifeq ($(LOCAL_SDK_VERSION)$(TARGET_BUILD_APPS),test_current)
|
||||
LOCAL_JAVA_LIBRARIES := android_test_stubs_current $(LOCAL_JAVA_LIBRARIES)
|
||||
else
|
||||
LOCAL_JAVA_LIBRARIES := sdk_v$(LOCAL_SDK_VERSION) $(LOCAL_JAVA_LIBRARIES)
|
||||
endif
|
||||
|
||||
ifeq ($(LOCAL_SDK_VERSION),current)
|
||||
my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)
|
||||
else ifeq ($(LOCAL_SDK_VERSION),system_current)
|
||||
my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)
|
||||
else ifeq ($(LOCAL_SDK_VERSION),test_current)
|
||||
my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)
|
||||
else
|
||||
my_jack_min_sdk_version := $(LOCAL_SDK_VERSION)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
else
|
||||
my_jack_min_sdk_version := $(PLATFORM_JACK_MIN_SDK_VERSION)
|
||||
endif
|
||||
|
||||
ifneq (,$(strip $(LOCAL_MIN_SDK_VERSION)))
|
||||
my_jack_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef LOCAL_MIN_SDK_VERSION
|
||||
my_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
|
||||
else
|
||||
my_min_sdk_version := $(call codename-or-sdk-to-sdk,\
|
||||
$(PRIVATE_DEFAULT_APP_TARGET_SDK))
|
||||
endif
|
||||
|
||||
ifndef LOCAL_SDK_VERSION
|
||||
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
||||
LOCAL_JAVA_LIBRARIES := $(TARGET_DEFAULT_JAVA_LIBRARIES) $(LOCAL_JAVA_LIBRARIES)
|
||||
|
|
@ -163,11 +114,6 @@ else
|
|||
full_classes_jar := $(intermediates.COMMON)/classes.jar
|
||||
built_dex := $(intermediates.COMMON)/classes.dex
|
||||
endif
|
||||
# final Jack library, shrinked and obfuscated if it must be
|
||||
full_classes_jack := $(intermediates.COMMON)/classes.jack
|
||||
# intermediate Jack library without shrink and obfuscation
|
||||
noshrob_classes_jack := $(intermediates.COMMON)/classes.noshrob.jack
|
||||
jack_check_timestamp := $(intermediates.COMMON)/jack.check.timestamp
|
||||
|
||||
LOCAL_INTERMEDIATE_TARGETS += \
|
||||
$(full_classes_turbine_jar) \
|
||||
|
|
@ -178,9 +124,6 @@ LOCAL_INTERMEDIATE_TARGETS += \
|
|||
$(full_classes_combined_jar) \
|
||||
$(full_classes_proguard_jar) \
|
||||
$(built_dex_intermediate) \
|
||||
$(full_classes_jack) \
|
||||
$(noshrob_classes_jack) \
|
||||
$(jack_check_timestamp) \
|
||||
$(built_dex) \
|
||||
$(full_classes_stubs_jar) \
|
||||
$(java_source_list_file)
|
||||
|
|
@ -382,15 +325,7 @@ endif
|
|||
# command line.
|
||||
ifndef LOCAL_CHECKED_MODULE
|
||||
ifdef full_classes_jar
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifeq ($(LOCAL_JACK_ENABLED),javac_frontend)
|
||||
LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)
|
||||
else
|
||||
LOCAL_CHECKED_MODULE := $(jack_check_timestamp)
|
||||
endif
|
||||
else
|
||||
LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -436,9 +371,6 @@ $(error $(LOCAL_PATH): Target java module does not define any source or resource
|
|||
endif
|
||||
endif
|
||||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_MIN_SDK_VERSION := $(my_jack_min_sdk_version)
|
||||
my_jack_min_sdk_version :=
|
||||
|
||||
# Since we're using intermediates.COMMON, make sure that it gets cleaned
|
||||
# properly.
|
||||
$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
|
||||
|
|
@ -473,7 +405,6 @@ endif
|
|||
ifneq (,$(PRODUCT_MINIMIZE_JAVA_DEBUG_INFO))
|
||||
ifneq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))
|
||||
LOCAL_JAVACFLAGS+= -g:source,lines
|
||||
LOCAL_JACK_FLAGS+= -D jack.dex.debug.vars=false -D jack.dex.debug.vars.synthetic=false
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -590,14 +521,12 @@ endif
|
|||
$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))
|
||||
|
||||
my_desugaring :=
|
||||
ifndef LOCAL_JACK_ENABLED
|
||||
ifndef LOCAL_IS_STATIC_JAVA_LIBRARY
|
||||
my_desugaring := true
|
||||
$(full_classes_desugar_jar): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
|
||||
$(full_classes_desugar_jar): $(full_classes_jar) $(full_java_header_libs) $(DESUGAR)
|
||||
$(desugar-classes-jar)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef my_desugaring
|
||||
full_classes_desugar_jar := $(full_classes_jar)
|
||||
|
|
@ -621,7 +550,6 @@ ifneq ($(filter-out full custom nosystem obfuscation optimization shrinktests,$(
|
|||
$(error invalid value for LOCAL_PROGUARD_ENABLED: $(LOCAL_PROGUARD_ENABLED))
|
||||
endif
|
||||
proguard_dictionary := $(intermediates.COMMON)/proguard_dictionary
|
||||
jack_dictionary := $(intermediates.COMMON)/jack_dictionary
|
||||
|
||||
# Hack: see b/20667396
|
||||
# When an app's LOCAL_SDK_VERSION is lower than the support library's LOCAL_SDK_VERSION,
|
||||
|
|
@ -643,7 +571,6 @@ endif
|
|||
endif
|
||||
endif
|
||||
|
||||
# jack already has the libraries in its classpath and doesn't support jars
|
||||
legacy_proguard_flags := $(addprefix -libraryjars ,$(my_support_library_sdk_raise) \
|
||||
$(filter-out $(my_support_library_sdk_raise), \
|
||||
$(full_java_bootclasspath_libs) \
|
||||
|
|
@ -653,7 +580,6 @@ legacy_proguard_lib_deps := $(my_support_library_sdk_raise) \
|
|||
$(filter-out $(my_support_library_sdk_raise),$(full_shared_java_header_libs))
|
||||
|
||||
legacy_proguard_flags += -printmapping $(proguard_dictionary)
|
||||
jack_proguard_flags := -printmapping $(jack_dictionary)
|
||||
|
||||
common_proguard_flags := -forceprocessing
|
||||
|
||||
|
|
@ -661,11 +587,7 @@ common_proguard_flag_files :=
|
|||
ifeq ($(filter nosystem,$(LOCAL_PROGUARD_ENABLED)),)
|
||||
common_proguard_flag_files += $(BUILD_SYSTEM)/proguard.flags
|
||||
ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
common_proguard_flag_files += $(BUILD_SYSTEM)/proguard.jacoco.flags
|
||||
else
|
||||
common_proguard_flags += -include $(BUILD_SYSTEM)/proguard.emma.flags
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
endif
|
||||
# If this is a test package, add proguard keep flags for tests.
|
||||
ifneq ($(LOCAL_INSTRUMENTATION_FOR)$(filter tests,$(LOCAL_MODULE_TAGS)),)
|
||||
|
|
@ -693,7 +615,6 @@ ifdef LOCAL_INSTRUMENTATION_FOR
|
|||
ifeq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
|
||||
# If no obfuscation, link in the instrmented package's classes.jar as a library.
|
||||
# link_instr_classes_jar is defined in base_rule.mk
|
||||
# jack already has this library in its classpath and doesn't support jars
|
||||
legacy_proguard_flags += -libraryjars $(link_instr_classes_jar)
|
||||
legacy_proguard_lib_deps += $(link_instr_classes_jar)
|
||||
else # obfuscation
|
||||
|
|
@ -706,10 +627,6 @@ legacy_proguard_flags := -injars $(link_instr_classes_jar) \
|
|||
-applymapping $(link_instr_intermediates_dir.COMMON)/proguard_dictionary \
|
||||
-verbose \
|
||||
$(legacy_proguard_flags)
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
jack_proguard_flags += -applymapping $(link_instr_intermediates_dir.COMMON)/jack_dictionary
|
||||
full_jack_deps += $(link_instr_intermediates_dir.COMMON)/jack_dictionary
|
||||
endif
|
||||
|
||||
# Sometimes (test + main app) uses different keep rules from the main app -
|
||||
# apply the main app's dictionary anyway.
|
||||
|
|
@ -731,20 +648,18 @@ else
|
|||
extra_input_jar :=
|
||||
endif
|
||||
|
||||
# If not using jack and building against the current SDK version then filter
|
||||
# out the junit, android.test and c.a.i.u.Predicate classes that are to be
|
||||
# removed from the Android API as part of b/30188076 but which are still
|
||||
# present in the Android API. This is to allow changes to be made to the
|
||||
# build to statically include those classes into the application without
|
||||
# If building against the current SDK version then filter out the junit,
|
||||
# android.test and c.a.i.u.Predicate classes that are to be removed from
|
||||
# the Android API as part of b/30188076 but which are still present in
|
||||
# the Android API. This is to allow changes to be made to the build to
|
||||
# statically include those classes into the application without
|
||||
# simultaneously removing those classes from the API.
|
||||
proguard_injar_filters :=
|
||||
ifndef LOCAL_JACK_ENABLED
|
||||
ifdef LOCAL_SDK_VERSION
|
||||
ifeq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))
|
||||
proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!junit/textui/**,!android/test/**,!com/android/internal/util/*)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
|
||||
$(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
|
||||
|
|
@ -760,7 +675,6 @@ full_classes_proguard_jar := $(full_classes_pre_proguard_jar)
|
|||
endif # LOCAL_PROGUARD_ENABLED defined
|
||||
|
||||
ifneq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
|
||||
ifndef LOCAL_JACK_ENABLED
|
||||
$(built_dex_intermediate): PRIVATE_DX_FLAGS := $(LOCAL_DX_FLAGS)
|
||||
# If you instrument class files that have local variable debug information in
|
||||
# them emma does not correctly maintain the local variable table.
|
||||
|
|
@ -773,7 +687,6 @@ $(built_dex_intermediate): PRIVATE_DX_FLAGS += --no-locals
|
|||
endif
|
||||
$(built_dex_intermediate): $(full_classes_proguard_jar) $(DX)
|
||||
$(transform-classes.jar-to-dex)
|
||||
endif # LOCAL_JACK_ENABLED is disabled
|
||||
|
||||
$(built_dex): $(built_dex_intermediate)
|
||||
@echo Copying: $@
|
||||
|
|
@ -819,7 +732,6 @@ else
|
|||
my_sdk_version := $(PLATFORM_SDK_VERSION)
|
||||
endif
|
||||
|
||||
|
||||
ifdef LOCAL_MIN_SDK_VERSION
|
||||
my_min_sdk_version := $(LOCAL_MIN_SDK_VERSION)
|
||||
else
|
||||
|
|
@ -829,135 +741,3 @@ endif
|
|||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(my_default_app_target_sdk)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(my_sdk_version)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MIN_SDK_VERSION := $(my_min_sdk_version)
|
||||
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): \
|
||||
PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-rsc
|
||||
ifeq ($(LOCAL_JACK_ENABLED),incremental)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): \
|
||||
PRIVATE_JACK_INCREMENTAL_DIR := $(intermediates.COMMON)/jack-incremental
|
||||
$(noshrob_classes_jack): PRIVATE_JACK_INCREMENTAL_DIR := $(intermediates.COMMON)/jack-noshrob-incremental
|
||||
$(jack_check_timestamp): PRIVATE_JACK_INCREMENTAL_DIR := $(intermediates.COMMON)/jack-check-incremental
|
||||
else
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): \
|
||||
PRIVATE_JACK_INCREMENTAL_DIR :=
|
||||
$(noshrob_classes_jack): PRIVATE_JACK_INCREMENTAL_DIR :=
|
||||
$(jack_check_timestamp): PRIVATE_JACK_INCREMENTAL_DIR :=
|
||||
endif
|
||||
|
||||
ifdef full_classes_jar
|
||||
ifdef LOCAL_PROGUARD_ENABLED
|
||||
|
||||
ifndef LOCAL_JACK_PROGUARD_FLAGS
|
||||
LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS)
|
||||
endif
|
||||
LOCAL_JACK_PROGUARD_FLAGS += $(addprefix -include , $(proguard_flag_files))
|
||||
ifdef LOCAL_TEST_MODULE_TO_PROGUARD_WITH
|
||||
$(error $(LOCAL_MODULE): Build with jack when LOCAL_TEST_MODULE_TO_PROGUARD_WITH is defined is not yet implemented)
|
||||
endif
|
||||
|
||||
# $(jack_dictionary) is just by-product of $(built_dex_intermediate).
|
||||
# The dummy command was added because, without it, make misses the fact the $(built_dex) also
|
||||
# change $(jack_dictionary).
|
||||
$(jack_dictionary): $(full_classes_jack)
|
||||
$(hide) touch $@
|
||||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_PROGUARD_FLAGS := $(common_proguard_flags) $(jack_proguard_flags) $(LOCAL_JACK_PROGUARD_FLAGS)
|
||||
else # LOCAL_PROGUARD_ENABLED not defined
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_PROGUARD_FLAGS :=
|
||||
endif # LOCAL_PROGUARD_ENABLED defined
|
||||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_FLAGS := -g $(LOCAL_JACK_FLAGS) $(annotation_processor_flags)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_VERSION := $(LOCAL_JACK_VERSION)
|
||||
|
||||
jack_all_deps := \
|
||||
$(java_source_list_file) \
|
||||
$(java_sources_deps) \
|
||||
$(full_jack_deps) \
|
||||
$(jar_manifest_file) \
|
||||
$(layers_file) \
|
||||
$(common_proguard_flag_files) \
|
||||
$(proguard_flag_files) \
|
||||
$(annotation_processor_deps) \
|
||||
$(LOCAL_JARJAR_RULES) \
|
||||
$(NORMALIZE_PATH) \
|
||||
$(JACK_DEFAULT_ARGS) \
|
||||
$(JACK)
|
||||
|
||||
$(jack_check_timestamp): $(jack_all_deps) | setup-jack-server
|
||||
@echo Checking build with Jack: $@
|
||||
$(jack-check-java)
|
||||
|
||||
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
|
||||
$(full_classes_jack): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)
|
||||
$(full_classes_jack): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)
|
||||
$(full_classes_jack): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server
|
||||
@echo Building with Jack: $@
|
||||
$(java-to-jack)
|
||||
|
||||
# Update timestamps of .toc files for static java libraries so
|
||||
# dependents will be always rebuilt.
|
||||
$(built_dex).toc: $(full_classes_jack)
|
||||
touch $@
|
||||
|
||||
else #LOCAL_IS_STATIC_JAVA_LIBRARY
|
||||
$(built_dex_intermediate): PRIVATE_CLASSES_JACK := $(full_classes_jack)
|
||||
|
||||
ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
|
||||
LOCAL_JACK_PLUGIN_PATH += $(HOST_OUT_JAVA_LIBRARIES)/jack-coverage-plugin.jar
|
||||
LOCAL_JACK_PLUGIN += com.android.jack.coverage.CodeCoverage
|
||||
$(built_dex_intermediate): PRIVATE_JACK_COVERAGE_OPTIONS := \
|
||||
-D jack.coverage=true \
|
||||
-D jack.coverage.metadata.file=$(intermediates.COMMON)/coverage.em \
|
||||
-D jack.coverage.jacoco.package=$(JACOCO_PACKAGE_NAME) \
|
||||
$(addprefix -D jack.coverage.jacoco.include=,$(LOCAL_JACK_COVERAGE_INCLUDE_FILTER)) \
|
||||
$(addprefix -D jack.coverage.jacoco.exclude=,$(LOCAL_JACK_COVERAGE_EXCLUDE_FILTER))
|
||||
else
|
||||
$(built_dex_intermediate): PRIVATE_JACK_COVERAGE_OPTIONS :=
|
||||
endif
|
||||
|
||||
# Compiling with javac to jar, then converting jar to dex with jack
|
||||
ifeq ($(LOCAL_JACK_ENABLED),javac_frontend)
|
||||
|
||||
# PRIVATE_EXTRA_JAR_ARGS and source files were already handled during javac
|
||||
$(built_dex_intermediate): PRIVATE_EXTRA_JAR_ARGS :=
|
||||
$(built_dex_intermediate): PRIVATE_JAVA_SOURCES :=
|
||||
$(built_dex_intermediate): PRIVATE_SOURCE_INTERMEDIATES_DIR :=
|
||||
$(built_dex_intermediate): PRIVATE_HAS_PROTO_SOURCES :=
|
||||
$(built_dex_intermediate): PRIVATE_HAS_RS_SOURCES :=
|
||||
|
||||
# Incremental compilation is not supported when mixing javac and jack
|
||||
$(built_dex_intermediate): PRIVATE_JACK_INCREMENTAL_DIR :=
|
||||
|
||||
# Pass output of javac to jack
|
||||
$(built_dex_intermediate): PRIVATE_JACK_IMPORT_JAR := $(full_classes_compiled_jar)
|
||||
$(built_dex_intermediate): $(full_classes_compiled_jar)
|
||||
else # LOCAL_JACK_ENABLED != javac_frontend
|
||||
$(built_dex_intermediate): PRIVATE_JACK_IMPORT_JAR :=
|
||||
endif # LOCAL_JACK_ENABLED != javac_frontend
|
||||
|
||||
$(built_dex_intermediate): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)
|
||||
$(built_dex_intermediate): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)
|
||||
$(built_dex_intermediate): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server
|
||||
@echo Building with Jack: $@
|
||||
$(jack-java-to-dex)
|
||||
|
||||
# $(full_classes_jack) is just by-product of $(built_dex_intermediate).
|
||||
# The dummy command was added because, without it, make misses the fact the $(built_dex) also
|
||||
# change $(full_classes_jack).
|
||||
$(full_classes_jack): $(built_dex_intermediate)
|
||||
$(hide) touch $@
|
||||
|
||||
$(call define-dex-to-toc-rule, $(intermediates.COMMON))
|
||||
|
||||
endif #LOCAL_IS_STATIC_JAVA_LIBRARY
|
||||
|
||||
$(noshrob_classes_jack): PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)
|
||||
$(noshrob_classes_jack): PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)
|
||||
$(noshrob_classes_jack): PRIVATE_JACK_INTERMEDIATES_DIR := $(intermediates.COMMON)/jack-noshrob-rsc
|
||||
$(noshrob_classes_jack): PRIVATE_JACK_PROGUARD_FLAGS :=
|
||||
$(noshrob_classes_jack): $(jack_all_deps) $(LOCAL_JACK_PLUGIN_PATH) | setup-jack-server
|
||||
@echo Building with Jack: $@
|
||||
$(java-to-jack)
|
||||
endif # full_classes_jar is defined
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
|
|
|
|||
|
|
@ -358,75 +358,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ALL_JAVA_HEADER_LIBRARIES := $(full_java_
|
|||
ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR := \
|
||||
$(ALL_MODULES.$(my_register_name).INTERMEDIATE_SOURCE_DIR) $(LOCAL_INTERMEDIATE_SOURCE_DIR)
|
||||
|
||||
###########################################################
|
||||
# JACK
|
||||
###########################################################
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifdef need_compile_java
|
||||
|
||||
LOCAL_JACK_FLAGS += -D jack.java.source.version=$(LOCAL_JAVA_LANGUAGE_VERSION)
|
||||
|
||||
full_static_jack_libs := \
|
||||
$(foreach lib,$(LOCAL_STATIC_JAVA_LIBRARIES), \
|
||||
$(call intermediates-dir-for, \
|
||||
JAVA_LIBRARIES,$(lib),$(LOCAL_IS_HOST_MODULE),COMMON)/classes.jack)
|
||||
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JACK_LIBRARIES := $(full_static_jack_libs)
|
||||
|
||||
full_shared_jack_libs := $(call jack-lib-files,$(LOCAL_JAVA_LIBRARIES),$(LOCAL_IS_HOST_MODULE))
|
||||
ifndef LOCAL_SDK_VERSION
|
||||
ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)
|
||||
my_jack_bootclasspath := $(TARGET_DEFAULT_BOOTCLASSPATH_LIBRARIES)
|
||||
ifdef LOCAL_IS_HOST_MODULE
|
||||
my_jack_bootclasspath := $(addsuffix -hostdex,$(my_jack_bootclasspath))
|
||||
endif
|
||||
full_shared_jack_libs := $(call jack-lib-files,$(my_jack_bootclasspath),$(LOCAL_IS_HOST_MODULE)) $(full_shared_jack_libs)
|
||||
endif
|
||||
endif
|
||||
full_jack_deps := $(full_shared_jack_libs)
|
||||
|
||||
ifndef LOCAL_IS_HOST_MODULE
|
||||
# Turn off .toc optimization for apps build as we cannot build dexdump.
|
||||
ifeq (,$(TARGET_BUILD_APPS))
|
||||
full_jack_deps := $(patsubst %.jack, %.dex.toc, $(full_jack_deps))
|
||||
endif
|
||||
endif # !LOCAL_IS_HOST_MODULE
|
||||
full_shared_jack_libs += $(LOCAL_JACK_CLASSPATH)
|
||||
full_jack_deps += $(full_static_jack_libs) $(LOCAL_JACK_CLASSPATH)
|
||||
|
||||
ifndef LOCAL_IS_HOST_MODULE
|
||||
# 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_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_shared_jack_libs += $(link_instr_classes_jack)
|
||||
full_jack_deps += $(link_instr_classes_jack)
|
||||
endif # LOCAL_INSTRUMENTATION_FOR
|
||||
endif # !LOCAL_IS_HOST_MODULE
|
||||
|
||||
# Propagate local configuration options to this target.
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_SHARED_LIBRARIES:= $(full_shared_jack_libs)
|
||||
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
|
||||
|
||||
endif # need_compile_java
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
|
||||
|
||||
###########################################################
|
||||
# Verify that all libraries are safe to use
|
||||
###########################################################
|
||||
|
|
|
|||
|
|
@ -25,21 +25,8 @@ endif
|
|||
|
||||
LOCAL_BUILT_MODULE_STEM := javalib.jar
|
||||
|
||||
#################################
|
||||
include $(BUILD_SYSTEM)/configure_local_jack.mk
|
||||
#################################
|
||||
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifdef LOCAL_IS_STATIC_JAVA_LIBRARY
|
||||
LOCAL_BUILT_MODULE_STEM := classes.jack
|
||||
endif
|
||||
endif
|
||||
|
||||
# For non-static java libraries, other modules should depend on
|
||||
# out/target/common/obj/JAVA_LIBRARIES/.../javalib.jar (for jack)
|
||||
# or out/target/common/obj/JAVA_LIBRARIES/.../classes.jar (for javac).
|
||||
# For static java libraries, other modules should depend on
|
||||
# out/target/common/obj/JAVA_LIBRARIES/.../classes.jar
|
||||
# For java libraries, other modules should depend on
|
||||
# out/target/common/obj/JAVA_LIBRARIES/.../classes.jar.
|
||||
# There are some dependencies outside the build system that assume static
|
||||
# java libraries produce javalib.jar, so we will copy classes.jar there too.
|
||||
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
|
||||
|
|
@ -69,11 +56,7 @@ ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
|
|||
# is available as javalib.jar so copy it there too.
|
||||
$(eval $(call copy-one-file,$(full_classes_proguard_jar),$(common_javalib.jar)))
|
||||
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(eval $(call copy-one-file,$(full_classes_jack),$(LOCAL_BUILT_MODULE)))
|
||||
else
|
||||
$(eval $(call copy-one-file,$(full_classes_proguard_jar),$(LOCAL_BUILT_MODULE)))
|
||||
endif
|
||||
|
||||
else # !LOCAL_IS_STATIC_JAVA_LIBRARY
|
||||
|
||||
|
|
@ -82,15 +65,8 @@ $(common_javalib.jar): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar
|
|||
$(common_javalib.jar): PRIVATE_DONT_DELETE_JAR_DIRS := $(LOCAL_DONT_DELETE_JAR_DIRS)
|
||||
$(common_javalib.jar) : $(built_dex) $(java_resource_sources) | $(ZIPTIME)
|
||||
@echo "target Jar: $(PRIVATE_MODULE) ($@)"
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(call create-empty-package-at,$@.tmp)
|
||||
else
|
||||
$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@.tmp)
|
||||
endif
|
||||
$(call add-dex-to-package-arg,$@.tmp)
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(call add-carried-jack-resources-to,$@.tmp)
|
||||
endif
|
||||
$(hide) $(ZIPTIME) $@.tmp
|
||||
$(call commit-change-for-toc,$@)
|
||||
|
||||
|
|
|
|||
49
core/main.mk
49
core/main.mk
|
|
@ -84,24 +84,13 @@ $(shell mkdir -p $(EMPTY_DIRECTORY) && rm -rf $(EMPTY_DIRECTORY)/*)
|
|||
-include tools/tradefederation/build/suites/general-tests/config.mk
|
||||
|
||||
# Clean rules
|
||||
.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) find $(OUT_DIR) -name "*.dex" | 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."
|
||||
|
||||
# Include the google-specific config
|
||||
-include vendor/google/build/config.mk
|
||||
|
||||
|
|
@ -186,22 +175,6 @@ TARGET_BUILD_JAVA_SUPPORT_LEVEL := platform
|
|||
# The pdk (Platform Development Kit) build
|
||||
include build/core/pdk_config.mk
|
||||
|
||||
#
|
||||
# -----------------------------------------------------------------
|
||||
# Jack version configuration
|
||||
-include $(TOPDIR)prebuilts/sdk/tools/jack_versions.mk
|
||||
-include $(TOPDIR)prebuilts/sdk/tools/jack_for_module.mk
|
||||
|
||||
#
|
||||
# -----------------------------------------------------------------
|
||||
# Install and start Jack server
|
||||
-include $(TOPDIR)prebuilts/sdk/tools/jack_server_setup.mk
|
||||
|
||||
#
|
||||
# -----------------------------------------------------------------
|
||||
# Jacoco package name for Jack
|
||||
-include $(TOPDIR)external/jacoco/config.mk
|
||||
|
||||
#
|
||||
# -----------------------------------------------------------------
|
||||
# Enable dynamic linker developer warnings for all builds except
|
||||
|
|
@ -1095,13 +1068,8 @@ ifneq ($(TARGET_BUILD_APPS),)
|
|||
$(call dist-for-goals,apps_only, $(apps_only_dist_built_files))
|
||||
|
||||
ifeq ($(EMMA_INSTRUMENT),true)
|
||||
ifeq ($(ANDROID_COMPILE_WITH_JACK),false)
|
||||
$(JACOCO_REPORT_CLASSES_ALL) : $(apps_only_installed_files)
|
||||
$(call dist-for-goals,apps_only, $(JACOCO_REPORT_CLASSES_ALL))
|
||||
else
|
||||
$(EMMA_META_ZIP) : $(apps_only_installed_files)
|
||||
$(call dist-for-goals,apps_only, $(EMMA_META_ZIP))
|
||||
endif
|
||||
$(JACOCO_REPORT_CLASSES_ALL) : $(apps_only_installed_files)
|
||||
$(call dist-for-goals,apps_only, $(JACOCO_REPORT_CLASSES_ALL))
|
||||
endif
|
||||
|
||||
$(PROGUARD_DICT_ZIP) : $(apps_only_installed_files)
|
||||
|
|
@ -1158,13 +1126,8 @@ else # TARGET_BUILD_APPS
|
|||
endif
|
||||
|
||||
ifeq ($(EMMA_INSTRUMENT),true)
|
||||
ifeq ($(ANDROID_COMPILE_WITH_JACK),false)
|
||||
$(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE)
|
||||
$(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))
|
||||
else
|
||||
$(EMMA_META_ZIP) : $(INSTALLED_SYSTEMIMAGE)
|
||||
$(call dist-for-goals, dist_files, $(EMMA_META_ZIP))
|
||||
endif
|
||||
$(JACOCO_REPORT_CLASSES_ALL) : $(INSTALLED_SYSTEMIMAGE)
|
||||
$(call dist-for-goals, dist_files, $(JACOCO_REPORT_CLASSES_ALL))
|
||||
endif
|
||||
|
||||
# Building a full system-- the default is to build droidcore
|
||||
|
|
@ -1200,7 +1163,7 @@ target-java-tests : java-target-tests
|
|||
target-native-tests : native-target-tests
|
||||
tests : host-tests target-tests
|
||||
|
||||
# Phony target to run all java compilations that use javac instead of jack.
|
||||
# Phony target to run all java compilations that use javac
|
||||
.PHONY: javac-check
|
||||
|
||||
ifneq (,$(filter samplecode, $(MAKECMDGOALS)))
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ else
|
|||
# javalib.jar is the default name for the build module (and isn't meaningful)
|
||||
# If that's what we have, substitute the module name instead. These files
|
||||
# aren't included on the device, so this name is synthetic anyway.
|
||||
ifneq ($(filter javalib.jar classes.jack,$(module_leaf)),)
|
||||
ifneq ($(filter javalib.jar,$(module_leaf)),)
|
||||
module_leaf := $(LOCAL_MODULE).jar
|
||||
endif
|
||||
module_installed_filename := \
|
||||
|
|
|
|||
|
|
@ -60,10 +60,6 @@ LOCAL_MODULE_CLASS := APPS
|
|||
intermediates := $(call local-intermediates-dir)
|
||||
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
|
||||
|
||||
#################################
|
||||
include $(BUILD_SYSTEM)/configure_local_jack.mk
|
||||
#################################
|
||||
|
||||
# Package LOCAL_MODULE_TAGS default to optional
|
||||
LOCAL_MODULE_TAGS := $(strip $(LOCAL_MODULE_TAGS))
|
||||
ifeq ($(LOCAL_MODULE_TAGS),)
|
||||
|
|
@ -247,13 +243,6 @@ endif # need_compile_res
|
|||
endif # !custom
|
||||
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
|
||||
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifndef LOCAL_JACK_PROGUARD_FLAGS
|
||||
LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS)
|
||||
endif
|
||||
LOCAL_JACK_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_JACK_PROGUARD_FLAGS)
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
|
||||
ifeq (true,$(EMMA_INSTRUMENT))
|
||||
ifndef LOCAL_EMMA_INSTRUMENT
|
||||
# No jacoco for test apks.
|
||||
|
|
@ -280,20 +269,8 @@ ifneq ($(LOCAL_SRC_FILES)$(LOCAL_STATIC_JAVA_LIBRARIES)$(LOCAL_SOURCE_FILES_ALL_
|
|||
LOCAL_STATIC_JAVA_LIBRARIES += jacocoagent
|
||||
# Exclude jacoco classes from proguard
|
||||
LOCAL_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
|
||||
LOCAL_JACK_PROGUARD_FLAGS += -include $(BUILD_SYSTEM)/proguard.jacoco.flags
|
||||
endif # Contains java code
|
||||
else # ! TARGET_BUILD_APPS
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
# If build against the SDK in full build, core.jar is not used
|
||||
# so coverage classes are not present.
|
||||
# Jack needs jacoco on the classpath but we do not want it to be in
|
||||
# the final apk. While it is a static library, we add it to the
|
||||
# LOCAL_JAVA_LIBRARIES which are only present on the classpath.
|
||||
# Note: we have nothing to do for proguard since jacoco will be
|
||||
# on the classpath only, thus not modified during the compilation.
|
||||
LOCAL_JAVA_LIBRARIES += jacocoagent
|
||||
endif # ! LOCAL_JACK_ENABLED
|
||||
endif # ! TARGET_BUILD_APPS
|
||||
endif # TARGET_BUILD_APPS
|
||||
endif # LOCAL_SDK_VERSION
|
||||
endif # EMMA_INSTRUMENT_STATIC
|
||||
endif # LOCAL_EMMA_INSTRUMENT
|
||||
|
|
@ -304,7 +281,6 @@ ifeq ($(LOCAL_DATA_BINDING),true)
|
|||
data_binding_intermediates := $(intermediates.COMMON)/data-binding
|
||||
|
||||
LOCAL_JAVACFLAGS += -processorpath $(DATA_BINDING_COMPILER) -s $(data_binding_intermediates)/anno-src
|
||||
LOCAL_JACK_FLAGS += --processorpath $(DATA_BINDING_COMPILER)
|
||||
|
||||
LOCAL_STATIC_JAVA_LIBRARIES += databinding-baselibrary
|
||||
LOCAL_STATIC_JAVA_AAR_LIBRARIES += databinding-library databinding-adapters
|
||||
|
|
@ -358,8 +334,6 @@ $(data_binding_stamp) : $(all_res_assets) $(full_android_manifest) \
|
|||
$(R_file_stamp): $(data_binding_stamp)
|
||||
$(java_source_list_file): $(data_binding_stamp)
|
||||
$(full_classes_compiled_jar): $(data_binding_stamp)
|
||||
# The dependency path when jack is enabled
|
||||
$(built_dex_intermediate) : $(data_binding_stamp)
|
||||
endif # LOCAL_DATA_BINDING
|
||||
|
||||
ifeq ($(need_compile_res),true)
|
||||
|
|
@ -575,13 +549,9 @@ endif
|
|||
ifdef LOCAL_USE_AAPT2
|
||||
$(call copy-file-to-new-target)
|
||||
else # ! LOCAL_USE_AAPT2
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(create-empty-package)
|
||||
else
|
||||
$(if $(PRIVATE_SOURCE_ARCHIVE),\
|
||||
$(call initialize-package-file,$(PRIVATE_SOURCE_ARCHIVE),$@),\
|
||||
$(create-empty-package))
|
||||
endif
|
||||
$(add-assets-to-package)
|
||||
endif # LOCAL_USE_AAPT2
|
||||
ifneq ($(jni_shared_libraries),)
|
||||
|
|
@ -593,14 +563,9 @@ ifeq ($(full_classes_jar),)
|
|||
else # full_classes_jar
|
||||
$(add-dex-to-package)
|
||||
ifdef LOCAL_USE_AAPT2
|
||||
ifndef LOCAL_JACK_ENABLED
|
||||
$(call add-jar-resources-to-package,$@,$(PRIVATE_FULL_CLASSES_JAR),$(PRIVATE_RESOURCE_INTERMEDIATES_DIR))
|
||||
endif
|
||||
endif
|
||||
endif # full_classes_jar
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(add-carried-jack-resources)
|
||||
endif
|
||||
ifdef LOCAL_DEX_PREOPT
|
||||
ifneq ($(BUILD_PLATFORM_ZIP),)
|
||||
@# Keep a copy of apk with classes.dex unstripped
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR := \
|
|||
$(PDK_PLATFORM_JAVA_ZIP_JAVA_HOST_LIB_DIR)
|
||||
|
||||
PDK_PLATFORM_JAVA_ZIP_CONTENTS += $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_LIB_DIR),\
|
||||
$(lib_dir)/classes.jack $(lib_dir)/classes.jar $(lib_dir)/classes.jar.toc \
|
||||
$(lib_dir)/classes.jar $(lib_dir)/classes.jar.toc \
|
||||
$(lib_dir)/javalib.jar $(lib_dir)/classes*.dex \
|
||||
$(lib_dir)/classes.dex.toc )
|
||||
|
||||
|
|
@ -115,14 +115,6 @@ $(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\
|
|||
$(eval $(call JAVA_dependency_template,$(lib_dir)/javalib.jar,\
|
||||
$(lib_dir)/classes.jar)))
|
||||
|
||||
# pull .jack and .dex files
|
||||
$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\
|
||||
$(eval $(call JAVA_dependency_template,$(lib_dir)/classes.jar.toc,\
|
||||
$(lib_dir)/classes.jar $(lib_dir)/classes.jack)))
|
||||
$(foreach lib_dir,$(PDK_PLATFORM_JAVA_ZIP_JAVA_TARGET_LIB_DIR),\
|
||||
$(eval $(call JAVA_dependency_template,$(lib_dir)/classes.dex.toc,\
|
||||
$(lib_dir)/classes.jar $(lib_dir)/classes.jack $(lib_dir)/classes%.dex)))
|
||||
|
||||
# implicit rules for all other target files
|
||||
$(TARGET_COMMON_OUT_ROOT)/% : $(_pdk_fusion_intermediates)/target/common/% $(_pdk_fusion_stamp)
|
||||
@mkdir -p $(dir $@)
|
||||
|
|
|
|||
|
|
@ -592,25 +592,6 @@ $(built_module) : $(common_javalib_jar)
|
|||
endif # ! prebuilt_module_is_dex_javalib
|
||||
endif # LOCAL_IS_HOST_MODULE is not set
|
||||
|
||||
ifneq ($(prebuilt_module_is_dex_javalib),true)
|
||||
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
# We may be building classes.jack from a host jar for host dalvik Java library.
|
||||
$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_FLAGS:=$(LOCAL_JACK_FLAGS)
|
||||
$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_MIN_SDK_VERSION := $(if $(strip $(LOCAL_MIN_SDK_VERSION)),$(LOCAL_MIN_SDK_VERSION),1)
|
||||
$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN_PATH := $(LOCAL_JACK_PLUGIN_PATH)
|
||||
$(intermediates.COMMON)/classes.jack : PRIVATE_JACK_PLUGIN := $(LOCAL_JACK_PLUGIN)
|
||||
$(intermediates.COMMON)/classes.jack : $(LOCAL_JACK_PLUGIN_PATH) $(my_src_jar) \
|
||||
$(LOCAL_ADDITIONAL_DEPENDENCIES) $(JACK_DEFAULT_ARGS) $(JACK) \
|
||||
| setup-jack-server
|
||||
$(transform-jar-to-jack)
|
||||
|
||||
# Update timestamps of .toc files for prebuilts so dependents will be
|
||||
# always rebuilt.
|
||||
$(intermediates.COMMON)/classes.dex.toc: $(intermediates.COMMON)/classes.jack
|
||||
touch $@
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
endif # ! prebuilt_module_is_dex_javalib
|
||||
endif # JAVA_LIBRARIES
|
||||
|
||||
$(built_module) : $(LOCAL_ADDITIONAL_DEPENDENCIES)
|
||||
|
|
|
|||
|
|
@ -142,7 +142,6 @@ _product_var_list := \
|
|||
PRODUCT_SYSTEM_HEADROOM \
|
||||
PRODUCT_MINIMIZE_JAVA_DEBUG_INFO \
|
||||
PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS \
|
||||
PRODUCT_COMPILE_WITH_JACK \
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -453,7 +453,3 @@ PRODUCT_MINIMIZE_JAVA_DEBUG_INFO := \
|
|||
# Whether any paths are excluded from sanitization when SANITIZE_TARGET=integer_overflow
|
||||
PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS := \
|
||||
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))
|
||||
|
||||
# Temporarily force Jack back on for a product
|
||||
PRODUCT_COMPILE_WITH_JACK := \
|
||||
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_COMPILE_WITH_JACK))
|
||||
|
|
|
|||
|
|
@ -24,10 +24,6 @@ LOCAL_UNINSTALLABLE_MODULE := true
|
|||
LOCAL_IS_STATIC_JAVA_LIBRARY := true
|
||||
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
|
||||
|
||||
#################################
|
||||
include $(BUILD_SYSTEM)/configure_local_jack.mk
|
||||
#################################
|
||||
|
||||
intermediates.COMMON := $(call local-intermediates-dir,COMMON)
|
||||
|
||||
my_res_package :=
|
||||
|
|
@ -76,13 +72,6 @@ endif
|
|||
|
||||
LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS)
|
||||
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
ifndef LOCAL_JACK_PROGUARD_FLAGS
|
||||
LOCAL_JACK_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS)
|
||||
endif
|
||||
LOCAL_JACK_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_JACK_PROGUARD_FLAGS)
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
|
||||
R_file_stamp := $(intermediates.COMMON)/src/R.stamp
|
||||
LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
|
||||
|
||||
|
|
@ -178,11 +167,6 @@ endif # LOCAL_USE_AAPT2
|
|||
|
||||
$(LOCAL_BUILT_MODULE): $(R_file_stamp)
|
||||
$(java_source_list_file): $(R_file_stamp)
|
||||
ifdef LOCAL_JACK_ENABLED
|
||||
$(noshrob_classes_jack): $(R_file_stamp)
|
||||
$(full_classes_jack): $(R_file_stamp)
|
||||
$(jack_check_timestamp): $(R_file_stamp)
|
||||
endif # LOCAL_JACK_ENABLED
|
||||
$(full_classes_compiled_jar): $(R_file_stamp)
|
||||
$(full_classes_turbine_jar): $(R_file_stamp)
|
||||
|
||||
|
|
|
|||
|
|
@ -113,15 +113,6 @@ ifndef PLATFORM_SDK_VERSION
|
|||
PLATFORM_SDK_VERSION := 26
|
||||
endif
|
||||
|
||||
ifndef PLATFORM_JACK_MIN_SDK_VERSION
|
||||
# This is definition of the min SDK version given to Jack for the current
|
||||
# platform. For released version it should be the same as
|
||||
# PLATFORM_SDK_VERSION. During development, this number may be incremented
|
||||
# before PLATFORM_SDK_VERSION if the platform starts to add new java
|
||||
# language supports.
|
||||
PLATFORM_JACK_MIN_SDK_VERSION := o-b1
|
||||
endif
|
||||
|
||||
ifndef PLATFORM_VERSION_CODENAME
|
||||
PLATFORM_VERSION_CODENAME := $(PLATFORM_VERSION_CODENAME.$(TARGET_PLATFORM_VERSION))
|
||||
ifndef PLATFORM_VERSION_CODENAME
|
||||
|
|
|
|||
Loading…
Reference in a new issue