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

Commit 265c1cc9 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Remove HOST_DALVIK_*" am: 544aedda 

Original change: https://android-review.googlesource.com/c/platform/build/+/2059991



Change-Id: Icaaef9cc29cbaba05e461341c6ea4296983568d9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 006413cb 544aedda

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ BUILD_NATIVE_TEST :=$= $(BUILD_SYSTEM)/native_test.mk 
BUILD_FUZZ_TEST :=$= $(BUILD_SYSTEM)/fuzz_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 $(BUILD_SYSTEM)/deprecation.mk

core/definitions.mk

+0 −2
Original line number Diff line number Diff line
@@ -3360,8 +3360,6 @@ STATS.MODULE_TYPE := \ 
  STATIC_TEST_LIBRARY \

  HOST_STATIC_TEST_LIBRARY \

  NOTICE_FILE \

  HOST_DALVIK_JAVA_LIBRARY \

  HOST_DALVIK_STATIC_JAVA_LIBRARY \

  base_rules \

  HEADER_LIBRARY \

  HOST_TEST_CONFIG \

core/deprecation.mk

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ AVAILABLE_BUILD_MODULE_TYPES :=$= \ 
  BUILD_EXECUTABLE \

  BUILD_FUZZ_TEST \

  BUILD_HEADER_LIBRARY \

  BUILD_HOST_DALVIK_JAVA_LIBRARY \

  BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \

  BUILD_HOST_JAVA_LIBRARY \

  BUILD_HOST_PREBUILT \

  BUILD_JAVA_LIBRARY \
@@ -39,6 +37,8 @@ DEFAULT_ERROR_BUILD_MODULE_TYPES :=$= \ 
OBSOLETE_BUILD_MODULE_TYPES :=$= \

  BUILD_AUX_EXECUTABLE \

  BUILD_AUX_STATIC_LIBRARY \

  BUILD_HOST_DALVIK_JAVA_LIBRARY \

  BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY \

  BUILD_HOST_FUZZ_TEST \

  BUILD_HOST_NATIVE_TEST \

  BUILD_HOST_SHARED_TEST_LIBRARY \

core/host_dalvik_java_library.mk

deleted100644 → 0
+0 −191
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.

#

$(call record-module-type,HOST_DALVIK_JAVA_LIBRARY)



#

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

#



ifeq ($(HOST_OS),linux)

USE_CORE_LIB_BOOTCLASSPATH := true



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

include $(BUILD_SYSTEM)/host_java_library_common.mk

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



full_classes_turbine_jar := $(intermediates.COMMON)/classes-turbine.jar

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

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar

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

full_classes_combined_jar := $(intermediates.COMMON)/classes-combined.jar

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

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

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

java_source_list_file := $(intermediates.COMMON)/java-source-list



LOCAL_INTERMEDIATE_TARGETS += \

    $(full_classes_turbine_jar) \

    $(full_classes_compiled_jar) \

    $(full_classes_combined_jar) \

    $(full_classes_jarjar_jar) \

    $(full_classes_jar) \

    $(built_dex) \

    $(java_source_list_file)



# See comment in java.mk

ifndef LOCAL_CHECKED_MODULE

ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)

LOCAL_CHECKED_MODULE := $(full_classes_compiled_jar)

else

LOCAL_CHECKED_MODULE := $(built_dex)

endif

endif



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

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



include $(BUILD_SYSTEM)/sdk_check.mk



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



# List of dependencies for anything that needs all java sources in place

java_sources_deps := \

    $(java_sources) \

    $(java_resource_sources) \

    $(LOCAL_SRCJARS) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)



$(java_source_list_file): $(java_sources_deps)

	$(write-java-source-list)



# TODO(b/143658984): goma can't handle the --system argument to javac.

#$(full_classes_compiled_jar): .KATI_NINJA_POOL := $(GOMA_POOL)

$(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 :=

$(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES :=

$(full_classes_compiled_jar): PRIVATE_SRCJARS := $(LOCAL_SRCJARS)

$(full_classes_compiled_jar): PRIVATE_SRCJAR_LIST_FILE := $(intermediates.COMMON)/srcjar-list

$(full_classes_compiled_jar): PRIVATE_SRCJAR_INTERMEDIATES_DIR := $(intermediates.COMMON)/srcjars

$(full_classes_compiled_jar): \

    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_header_libs) \

    $(full_java_bootclasspath_libs) \

    $(full_java_system_modules_deps) \

    $(annotation_processor_deps) \

    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \

    $(ZIPSYNC) \

    $(SOONG_ZIP) \

    | $(SOONG_JAVAC_WRAPPER)

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



ifneq ($(TURBINE_ENABLED),false)



$(full_classes_turbine_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(annotation_processor_flags)

$(full_classes_turbine_jar): PRIVATE_SRCJARS := $(LOCAL_SRCJARS)

$(full_classes_turbine_jar): \

    $(java_source_list_file) \

    $(java_sources_deps) \

    $(full_java_header_libs) \

    $(full_java_bootclasspath_libs) \

    $(NORMALIZE_PATH) \

    $(JAR_ARGS) \

    $(ZIPTIME) \

    | $(TURBINE) \

    $(MERGE_ZIPS)

	$(transform-java-to-header.jar)



.KATI_RESTAT: $(full_classes_turbine_jar)



# Run jarjar before generate classes-header.jar if necessary.

ifneq ($(strip $(LOCAL_JARJAR_RULES)),)

$(full_classes_header_jarjar): PRIVATE_JARJAR_RULES := $(LOCAL_JARJAR_RULES)

$(full_classes_header_jarjar): $(full_classes_turbine_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	$(call transform-jarjar)

else

full_classes_header_jarjar := $(full_classes_turbine_jar)

endif



$(eval $(call copy-one-file,$(full_classes_header_jarjar),$(full_classes_header_jar)))



endif # TURBINE_ENABLED != false



$(full_classes_combined_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)

$(full_classes_combined_jar): $(full_classes_compiled_jar) \

                              $(jar_manifest_file) \

                              $(full_static_java_libs)  | $(MERGE_ZIPS)

	$(if $(PRIVATE_JAR_MANIFEST), $(hide) sed -e "s/%BUILD_NUMBER%/$(BUILD_NUMBER_FROM_FILE)/" \

            $(PRIVATE_JAR_MANIFEST) > $(dir $@)/manifest.mf)

	$(MERGE_ZIPS) -j --ignore-duplicates $(if $(PRIVATE_JAR_MANIFEST),-m $(dir $@)/manifest.mf) \

            $(if $(PRIVATE_DONT_DELETE_JAR_META_INF),,-stripDir META-INF -zipToNotStrip $<) \

            $@ $< $(PRIVATE_STATIC_JAVA_LIBRARIES)



# 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_combined_jar) $(LOCAL_JARJAR_RULES) | $(JARJAR)

	$(call transform-jarjar)

else

full_classes_jarjar_jar := $(full_classes_combined_jar)

endif



$(eval $(call copy-one-file,$(full_classes_jarjar_jar),$(full_classes_jar)))



ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)

# No dex; all we want are the .class files with resources.

$(LOCAL_BUILT_MODULE) : $(java_resource_sources)

$(LOCAL_BUILT_MODULE) : $(full_classes_jar)

	@echo "host Static Jar: $(PRIVATE_MODULE) ($@)"

	$(copy-file-to-target)



else # !LOCAL_IS_STATIC_JAVA_LIBRARY

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

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

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

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



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

$(LOCAL_BUILT_MODULE): PRIVATE_SOURCE_ARCHIVE := $(full_classes_jarjar_jar)

$(LOCAL_BUILT_MODULE): $(MERGE_ZIPS) $(SOONG_ZIP) $(ZIP2ZIP)

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

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

	rm -rf $@.parts

	mkdir -p $@.parts

	$(call create-dex-jar,$@.parts/dex.zip,$(PRIVATE_DEX_FILE))

	$(call extract-resources-jar,$@.parts/res.zip,$(PRIVATE_SOURCE_ARCHIVE))

	$(MERGE_ZIPS) -j $@ $@.parts/dex.zip $@.parts/res.zip

	rm -rf $@.parts



endif # !LOCAL_IS_STATIC_JAVA_LIBRARY



$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_DEFAULT_APP_TARGET_SDK := $(call module-target-sdk-version)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_SDK_VERSION := $(call module-sdk-version)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MIN_SDK_VERSION := $(call codename-or-sdk-to-sdk,$(call module-min-sdk-version))



USE_CORE_LIB_BOOTCLASSPATH :=



endif

core/host_dalvik_static_java_library.mk

deleted100644 → 0
+0 −28
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.

#

$(call record-module-type,HOST_DALVIK_STATIC_JAVA_LIBRARY)



#

# Rules for building a host dalvik static java library.

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

# JRE.

#

LOCAL_UNINSTALLABLE_MODULE := true

LOCAL_IS_STATIC_JAVA_LIBRARY := true



include $(BUILD_SYSTEM)/host_dalvik_java_library.mk



LOCAL_IS_STATIC_JAVA_LIBRARY :=