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

Commit 3821622f authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Rework the generation of host java libraries."

parents b9041a45 40dae1fe

core/base_rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -393,8 +393,8 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_ja 
#                 to guarantee that the files in full_java_libs will

#                 be up-to-date.

ifdef LOCAL_IS_HOST_MODULE

ifeq ($(LOCAL_BUILD_HOST_DEX),true)

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

ifeq ($(USE_CORE_LIB_BOOTCLASSPATH),true)

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



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

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

core/config.mk

+3 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ BUILD_COPY_HEADERS := $(BUILD_SYSTEM)/copy_headers.mk 
BUILD_NATIVE_TEST := $(BUILD_SYSTEM)/native_test.mk

BUILD_HOST_NATIVE_TEST := $(BUILD_SYSTEM)/host_native_test.mk

BUILD_NOTICE_FILE := $(BUILD_SYSTEM)/notice_files.mk

BUILD_HOST_DALVIK_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_java_library.mk

BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY := $(BUILD_SYSTEM)/host_dalvik_static_java_library.mk





-include cts/build/config.mk

core/host_dalvik_java_library.mk

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

# Copyright (C) 2013 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.

#



#

# Rules for building a host dalvik java library. These libraries

# are meant to be used by a dalvik VM instance running on the host.

# They will be compiled against libcore and not the host JRE.

#



USE_CORE_LIB_BOOTCLASSPATH := true



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

include $(BUILD_SYSTEM)/host_java_library_common.mk

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



ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

  LOCAL_JAVA_LIBRARIES +=  core-hostdex

endif



full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar

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

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

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



LOCAL_INTERMEDIATE_TARGETS += \

    $(full_classes_compiled_jar) \

    $(full_classes_jarjar_jar) \

    $(full_classes_jar) \

    $(built_dex)



# See comment in java.mk

java_alternative_checked_module := $(full_classes_compiled_jar)



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

include $(BUILD_SYSTEM)/base_rules.mk

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



$(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g



java_alternative_checked_module :=



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



$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes

$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_SOURCE_INTERMEDIATES_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)



$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)



$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_RMTYPEDEFS :=

$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \

        $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)



# 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) | $(ACP)

	@echo Copying: $@

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

endif



$(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP)

	@echo Copying: $@

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



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

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

$(built_dex): $(full_classes_jar) $(DX)

	$(transform-classes.jar-to-dex)



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

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

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

	$(create-empty-package)

	$(add-dex-to-package)

	$(add-carried-java-resources)

ifneq ($(extra_jar_args),)

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

endif



USE_CORE_LIB_BOOTCLASSPATH :=

core/host_dalvik_static_java_library.mk

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

# Copyright (C) 2013 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.

#



#

# Rules for building a host dalvik static java library.

# These libraries will be compiled against libcore and not the host

# JRE.

#



USE_CORE_LIB_BOOTCLASSPATH := true

LOCAL_JAVA_LIBRARIES += core-hostdex



include $(BUILD_SYSTEM)/host_java_library.mk



USE_CORE_LIB_BOOTCLASSPATH :=

core/host_java_library.mk

+2 −96
Original line number Diff line number Diff line
@@ -18,55 +18,8 @@ 
# Standard rules for building a host java library.

#



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE_SUFFIX := $(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_IS_HOST_MODULE := true

LOCAL_BUILT_MODULE_STEM := javalib.jar



# base_rules.mk looks at this

all_res_assets :=



proto_sources := $(filter %.proto,$(LOCAL_SRC_FILES))

ifneq ($(proto_sources),)

ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),micro)

    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-2.3.0-micro

else

  ifeq ($(LOCAL_PROTOC_OPTIMIZE_TYPE),nano)

    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-2.3.0-nano

  else

    LOCAL_JAVA_LIBRARIES += host-libprotobuf-java-2.3.0-lite

  endif

endif

endif



intermediates := $(call local-intermediates-dir)

intermediates.COMMON := $(call local-intermediates-dir,COMMON)



LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src



ifeq ($(LOCAL_BUILD_HOST_DEX),true)

ifneq ($(LOCAL_NO_STANDARD_LIBRARIES),true)

  LOCAL_JAVA_LIBRARIES +=  core-hostdex

endif



full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar

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

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

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



LOCAL_INTERMEDIATE_TARGETS += \

    $(full_classes_compiled_jar) \

    $(full_classes_jarjar_jar) \

    $(full_classes_jar) \

    $(built_dex)



# See comment in java.mk

java_alternative_checked_module := $(full_classes_compiled_jar)

endif # LOCAL_BUILD_HOST_DEX



LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))



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

include $(BUILD_SYSTEM)/host_java_library_common.mk

include $(BUILD_SYSTEM)/base_rules.mk

#######################################
@@ -78,57 +31,10 @@ java_alternative_checked_module := 
# Run build/tools/java-layers.py for more details.

layers_file := $(addprefix $(LOCAL_PATH)/, $(LOCAL_JAVA_LAYERS_FILE))



ifeq ($(LOCAL_BUILD_HOST_DEX),true)

$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes

$(LOCAL_INTERMEDIATE_TARGETS): \

	PRIVATE_SOURCE_INTERMEDIATES_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)



$(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)



$(full_classes_compiled_jar): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES :=

$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \

        $(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)



# 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) | $(ACP)

	@echo Copying: $@

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

endif



$(full_classes_jar): $(full_classes_jarjar_jar) | $(ACP)

	@echo Copying: $@

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



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

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

$(built_dex): $(full_classes_jar) $(DX)

	$(transform-classes.jar-to-dex)



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

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

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

	$(create-empty-package)

	$(add-dex-to-package)

	$(add-carried-java-resources)

ifneq ($(extra_jar_args),)

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

endif



else

$(LOCAL_BUILT_MODULE): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(LOCAL_BUILT_MODULE): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)

$(LOCAL_BUILT_MODULE): PRIVATE_JAR_EXCLUDE_FILES :=

$(LOCAL_BUILT_MODULE): PRIVATE_JAVA_LAYERS_FILE := $(layers_file)

$(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \

		$(jar_manifest_file) $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)
 
endif  # LOCAL_BUILD_HOST_DEX