941b682099
Jack can silently handle using a java library as a static java library by merging in the java library dex file. This causes problems when switching to javac, because dex doesn't support dex merging with multidex enabled? Make the output files consistent between java libraries and static java libraries. Java libraries will now produce: classes-pre-proguard.jar: the classes before proguard processing classes.jar: the final jar file containing classes before dexing javalib.jar: a jar containing classes.dex Static java libraries will eventually only produce classes-pre-proguard.jar and classes.jar. All inter-library linking is done with classes.jar, so a java library can be used as a static java library. There are too many dependencies outside the build system that expect javalib.jar to exist for static and host java libraries, so for now continue to build a javalib.jar that is a copy of classes.jar. Test: m -j ANDROID_COMPILE_WITH_JACK=false java Test: m -j java Bug: 36901093 Change-Id: I6730e2d3ec38004874265b2a690442dec57b33f4
109 lines
4.2 KiB
Makefile
109 lines
4.2 KiB
Makefile
#
|
|
# 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.
|
|
#
|
|
|
|
$(call record-module-type,HOST_JAVA_LIBRARY)
|
|
|
|
#
|
|
# Standard rules for building a host java library.
|
|
#
|
|
|
|
#######################################
|
|
include $(BUILD_SYSTEM)/host_java_library_common.mk
|
|
#######################################
|
|
|
|
# Enable emma instrumentation only if the module asks so.
|
|
ifeq (true,$(LOCAL_EMMA_INSTRUMENT))
|
|
ifneq (true,$(EMMA_INSTRUMENT))
|
|
LOCAL_EMMA_INSTRUMENT :=
|
|
endif
|
|
endif
|
|
|
|
full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar
|
|
full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar
|
|
emma_intermediates_dir := $(intermediates.COMMON)/emma_out
|
|
# emma is hardcoded to use the leaf name of its input for the output file --
|
|
# only the output directory can be changed
|
|
full_classes_emma_jar := $(emma_intermediates_dir)/lib/$(notdir $(full_classes_jarjar_jar))
|
|
full_classes_jar := $(intermediates.COMMON)/classes.jar
|
|
|
|
LOCAL_INTERMEDIATE_TARGETS += \
|
|
$(full_classes_compiled_jar) \
|
|
$(full_classes_jarjar_jar) \
|
|
$(full_classes_emma_jar)
|
|
|
|
#######################################
|
|
include $(BUILD_SYSTEM)/base_rules.mk
|
|
#######################################
|
|
|
|
java_sources := $(addprefix $(LOCAL_PATH)/, $(filter %.java,$(LOCAL_SRC_FILES))) \
|
|
$(filter %.java,$(LOCAL_GENERATED_SOURCES))
|
|
all_java_sources := $(java_sources)
|
|
|
|
include $(BUILD_SYSTEM)/java_common.mk
|
|
|
|
# The layers file allows you to enforce a layering between java packages.
|
|
# Run build/tools/java-layers.py for more details.
|
|
layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))
|
|
|
|
$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)
|
|
$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) $(LOCAL_JAVACFLAGS)
|
|
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=
|
|
$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=
|
|
$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES :=
|
|
$(full_classes_compiled_jar): \
|
|
$(java_sources) \
|
|
$(java_resource_sources) \
|
|
$(full_java_lib_deps) \
|
|
$(jar_manifest_file) \
|
|
$(proto_java_sources_file_stamp) \
|
|
$(NORMALIZE_PATH) \
|
|
$(LOCAL_ADDITIONAL_DEPENDENCIES)
|
|
$(transform-host-java-to-package)
|
|
|
|
javac-check : $(full_classes_compiled_jar)
|
|
javac-check-$(LOCAL_MODULE) : $(full_classes_compiled_jar)
|
|
|
|
# Run jarjar if necessary, otherwise just copy the file.
|
|
ifneq ($(strip $(LOCAL_JARJAR_RULES)),)
|
|
$(full_classes_jarjar_jar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)
|
|
$(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)
|
|
@echo JarJar: $@
|
|
$(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@
|
|
else
|
|
full_classes_jarjar_jar := $(full_classes_compiled_jar)
|
|
endif
|
|
|
|
ifeq (true,$(LOCAL_EMMA_INSTRUMENT))
|
|
$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.em
|
|
$(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)
|
|
ifdef LOCAL_EMMA_COVERAGE_FILTER
|
|
$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILTER := $(LOCAL_EMMA_COVERAGE_FILTER)
|
|
else
|
|
# by default, avoid applying emma instrumentation onto emma classes itself,
|
|
# otherwise there will be exceptions thrown
|
|
$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILTER := *,-emma,-emmarun,-com.vladium.*
|
|
endif
|
|
# this rule will generate both $(PRIVATE_EMMA_COVERAGE_FILE) and
|
|
# $(full_classes_emma_jar)
|
|
$(full_classes_emma_jar) : $(full_classes_jarjar_jar) | $(EMMA_JAR)
|
|
$(transform-classes.jar-to-emma)
|
|
else # LOCAL_EMMA_INSTRUMENT
|
|
full_classes_emma_jar := $(full_classes_jarjar_jar)
|
|
endif # LOCAL_EMMA_INSTRUMENT
|
|
|
|
$(eval $(call copy-one-file,$(full_classes_emma_jar),$(LOCAL_BUILT_MODULE)))
|
|
$(eval $(call copy-one-file,$(full_classes_emma_jar),$(full_classes_jar)))
|