Loading core/Makefile +8 −18 Original line number Original line Diff line number Diff line Loading @@ -2692,7 +2692,6 @@ ifeq (true,$(EMMA_INSTRUMENT)) # to be instrumented. # to be instrumented. # Any dependencies are set up later in build/core/main.mk. # 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) : $(JACOCO_REPORT_CLASSES_ALL) : @echo "Collecting uninstrumented classes" @echo "Collecting uninstrumented classes" Loading @@ -2704,14 +2703,6 @@ $(JACOCO_REPORT_CLASSES_ALL) : # -q supress most output # -q supress most output # -X skip storing extended file attributes # -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 endif # EMMA_INSTRUMENT=true Loading @@ -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. # the dependency will be set up later in build/core/main.mk. $(PROGUARD_DICT_ZIP) : $(PROGUARD_DICT_ZIP) : @echo "Packaging Proguard obfuscation dictionary files." @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 \ if [ -n "$$dict_files" ]; then \ unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \ unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \ zip -qX $@ $$dict_files $$unobfuscated_jars; \ zip -qX $@ $$dict_files $$unobfuscated_jars; \ Loading Loading @@ -2907,7 +2898,6 @@ $(INTERNAL_SDK_TARGET): $(deps) -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -v "FONT_OUT=$(SDK_FONT_TEMP)" \ -v "FONT_OUT=$(SDK_FONT_TEMP)" \ -v "JACK_SDKTOOL_VERSION=$(JACK_SDKTOOL_VERSION)" \ -o $(PRIVATE_DIR) && \ -o $(PRIVATE_DIR) && \ cp -f $(target_notice_file_txt) \ cp -f $(target_notice_file_txt) \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ Loading core/config.mk +0 −14 Original line number Original line Diff line number Diff line Loading @@ -574,7 +574,6 @@ ZIPTIME := $(prebuilt_build_tools_bin)/ziptime # --------------------------------------------------------------- # --------------------------------------------------------------- # Generic tools. # Generic tools. JACK := $(HOST_OUT_EXECUTABLES)/jack 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 Loading Loading @@ -645,19 +644,6 @@ DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar FAT16COPY := build/tools/fat16copy.py FAT16COPY := build/tools/fat16copy.py CHECK_LINK_TYPE := build/tools/check_link_type.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) TURBINE := $(HOST_OUT_JAVA_LIBRARIES)/turbine$(COMMON_JAVA_PACKAGE_SUFFIX) 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 Loading core/configure_local_jack.mkdeleted 100644 → 0 +0 −44 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 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 core/definitions.mk +0 −184 Original line number Original line Diff line number Diff line Loading @@ -725,18 +725,6 @@ $(call app-lib-files,$(1)) endef endef endif 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 ## Returns true if $(1) and $(2) are equal. Returns ## the empty string if they are not equal. ## the empty string if they are not equal. Loading Loading @@ -2206,12 +2194,6 @@ define unzip-jar-files $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF) $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF) endef 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 # Return jar arguments to compress files in a given directory # $(1): directory # $(1): directory # # Loading Loading @@ -2312,106 +2294,6 @@ $(hide) $(ZIPTIME) $@.tmp $(hide) $(call commit-change-for-toc,$@) $(hide) $(call commit-change-for-toc,$@) endef 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 # 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 # .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 # of $1 when $1.tmp is identical to $1 so that ninja won't rebuild Loading Loading @@ -2453,54 +2335,6 @@ endef endif # TARGET_BUILD_APPS 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), # 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 # returns a number greater than the highest existing sdk version if it is, or # the input if it is not. # the input if it is not. Loading Loading @@ -2655,24 +2489,6 @@ $(hide) $(JAR) uf $(1) @$(1).jar-arg-list @rm -f $(1).jar-arg-list @rm -f $(1).jar-arg-list endef 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 # Add resources (non .class files) from a jar to a package # $(1): the package file # $(1): the package file # $(2): the jar file # $(2): the jar file Loading core/dpi_specific_apk.mk +0 −7 Original line number Original line Diff line number Diff line Loading @@ -35,12 +35,8 @@ $(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates) $(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := ifneq ($(full_classes_jar),) ifneq ($(full_classes_jar),) $(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex) $(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex) ifndef LOCAL_JACK_ENABLED # Use the jarjar processed arhive as the initial package file. # Use the jarjar processed arhive as the initial package file. $(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar) $(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) $(built_dpi_apk): $(built_dex) else else $(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dpi_apk): PRIVATE_DEX_FILE := Loading @@ -65,9 +61,6 @@ ifeq ($(full_classes_jar),) $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) else else $(add-dex-to-package) $(add-dex-to-package) ifdef LOCAL_JACK_ENABLED $(add-carried-jack-resources) endif endif endif $(sign-package) $(sign-package) Loading Loading
core/Makefile +8 −18 Original line number Original line Diff line number Diff line Loading @@ -2692,7 +2692,6 @@ ifeq (true,$(EMMA_INSTRUMENT)) # to be instrumented. # to be instrumented. # Any dependencies are set up later in build/core/main.mk. # 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) : $(JACOCO_REPORT_CLASSES_ALL) : @echo "Collecting uninstrumented classes" @echo "Collecting uninstrumented classes" Loading @@ -2704,14 +2703,6 @@ $(JACOCO_REPORT_CLASSES_ALL) : # -q supress most output # -q supress most output # -X skip storing extended file attributes # -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 endif # EMMA_INSTRUMENT=true Loading @@ -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. # the dependency will be set up later in build/core/main.mk. $(PROGUARD_DICT_ZIP) : $(PROGUARD_DICT_ZIP) : @echo "Packaging Proguard obfuscation dictionary files." @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 \ if [ -n "$$dict_files" ]; then \ unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \ unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \ zip -qX $@ $$dict_files $$unobfuscated_jars; \ zip -qX $@ $$dict_files $$unobfuscated_jars; \ Loading Loading @@ -2907,7 +2898,6 @@ $(INTERNAL_SDK_TARGET): $(deps) -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "TARGET_CPU_ABI=$(TARGET_CPU_ABI)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -v "DLL_EXTENSION=$(HOST_SHLIB_SUFFIX)" \ -v "FONT_OUT=$(SDK_FONT_TEMP)" \ -v "FONT_OUT=$(SDK_FONT_TEMP)" \ -v "JACK_SDKTOOL_VERSION=$(JACK_SDKTOOL_VERSION)" \ -o $(PRIVATE_DIR) && \ -o $(PRIVATE_DIR) && \ cp -f $(target_notice_file_txt) \ cp -f $(target_notice_file_txt) \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ $(PRIVATE_DIR)/system-images/android-$(PLATFORM_VERSION)/$(TARGET_CPU_ABI)/NOTICE.txt && \ Loading
core/config.mk +0 −14 Original line number Original line Diff line number Diff line Loading @@ -574,7 +574,6 @@ ZIPTIME := $(prebuilt_build_tools_bin)/ziptime # --------------------------------------------------------------- # --------------------------------------------------------------- # Generic tools. # Generic tools. JACK := $(HOST_OUT_EXECUTABLES)/jack 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 Loading Loading @@ -645,19 +644,6 @@ DATA_BINDING_COMPILER := $(HOST_OUT_JAVA_LIBRARIES)/databinding-compiler.jar FAT16COPY := build/tools/fat16copy.py FAT16COPY := build/tools/fat16copy.py CHECK_LINK_TYPE := build/tools/check_link_type.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) TURBINE := $(HOST_OUT_JAVA_LIBRARIES)/turbine$(COMMON_JAVA_PACKAGE_SUFFIX) 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 Loading
core/configure_local_jack.mkdeleted 100644 → 0 +0 −44 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 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
core/definitions.mk +0 −184 Original line number Original line Diff line number Diff line Loading @@ -725,18 +725,6 @@ $(call app-lib-files,$(1)) endef endef endif 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 ## Returns true if $(1) and $(2) are equal. Returns ## the empty string if they are not equal. ## the empty string if they are not equal. Loading Loading @@ -2206,12 +2194,6 @@ define unzip-jar-files $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF) $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,$(hide) rm -rf $(2)/META-INF) endef 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 # Return jar arguments to compress files in a given directory # $(1): directory # $(1): directory # # Loading Loading @@ -2312,106 +2294,6 @@ $(hide) $(ZIPTIME) $@.tmp $(hide) $(call commit-change-for-toc,$@) $(hide) $(call commit-change-for-toc,$@) endef 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 # 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 # .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 # of $1 when $1.tmp is identical to $1 so that ninja won't rebuild Loading Loading @@ -2453,54 +2335,6 @@ endef endif # TARGET_BUILD_APPS 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), # 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 # returns a number greater than the highest existing sdk version if it is, or # the input if it is not. # the input if it is not. Loading Loading @@ -2655,24 +2489,6 @@ $(hide) $(JAR) uf $(1) @$(1).jar-arg-list @rm -f $(1).jar-arg-list @rm -f $(1).jar-arg-list endef 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 # Add resources (non .class files) from a jar to a package # $(1): the package file # $(1): the package file # $(2): the jar file # $(2): the jar file Loading
core/dpi_specific_apk.mk +0 −7 Original line number Original line Diff line number Diff line Loading @@ -35,12 +35,8 @@ $(built_dpi_apk): PRIVATE_ADDITIONAL_CERTIFICATES := $(additional_certificates) $(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := ifneq ($(full_classes_jar),) ifneq ($(full_classes_jar),) $(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex) $(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dex) ifndef LOCAL_JACK_ENABLED # Use the jarjar processed arhive as the initial package file. # Use the jarjar processed arhive as the initial package file. $(built_dpi_apk): PRIVATE_SOURCE_ARCHIVE := $(full_classes_pre_proguard_jar) $(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) $(built_dpi_apk): $(built_dex) else else $(built_dpi_apk): PRIVATE_DEX_FILE := $(built_dpi_apk): PRIVATE_DEX_FILE := Loading @@ -65,9 +61,6 @@ ifeq ($(full_classes_jar),) $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) $(if $(PRIVATE_EXTRA_JAR_ARGS),$(call add-java-resources-to,$@)) else else $(add-dex-to-package) $(add-dex-to-package) ifdef LOCAL_JACK_ENABLED $(add-carried-jack-resources) endif endif endif $(sign-package) $(sign-package) Loading