diff options
| -rw-r--r-- | core/base_rules.mk | 4 | ||||
| -rw-r--r-- | core/config.mk | 3 | ||||
| -rw-r--r-- | core/host_dalvik_java_library.mk | 106 | ||||
| -rw-r--r-- | core/host_dalvik_static_java_library.mk | 28 | ||||
| -rw-r--r-- | core/host_java_library.mk | 99 | ||||
| -rw-r--r-- | core/host_java_library_common.mk | 47 |
6 files changed, 187 insertions, 100 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 96d7f39..6021c92 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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)) diff --git a/core/config.mk b/core/config.mk index 6bd2841..c6c9f31 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 diff --git a/core/host_dalvik_java_library.mk b/core/host_dalvik_java_library.mk new file mode 100644 index 0000000..a79d64d --- /dev/null +++ b/core/host_dalvik_java_library.mk @@ -0,0 +1,106 @@ +# +# 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 := diff --git a/core/host_dalvik_static_java_library.mk b/core/host_dalvik_static_java_library.mk new file mode 100644 index 0000000..05c4b16 --- /dev/null +++ b/core/host_dalvik_static_java_library.mk @@ -0,0 +1,28 @@ +# +# 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 := diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 84bd556..3287b57 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -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,55 +31,6 @@ 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): 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 - -else $(LOCAL_BUILT_MODULE): PRIVATE_JAVA_LAYERS_FILE := $(layers_file) $(LOCAL_BUILT_MODULE): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(LOCAL_BUILT_MODULE): PRIVATE_JAR_EXCLUDE_FILES := @@ -135,4 +39,3 @@ $(LOCAL_BUILT_MODULE): PRIVATE_RMTYPEDEFS := $(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 diff --git a/core/host_java_library_common.mk b/core/host_java_library_common.mk new file mode 100644 index 0000000..973afa0 --- /dev/null +++ b/core/host_java_library_common.mk @@ -0,0 +1,47 @@ +# +# 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. +# + +# +# Common 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 +LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES)) + |