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

Commit 7ef1ce5e authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes Ib7268cbf,I6658edb7,I4f19c31c into oc-dev 

* changes:
  Optimize out extra jar copies
  Revert "Revert "Revert "Add soong_javac_filter to all javac commands"""
  Add min and max supported versions
parents 7442f7bd 71b86c62

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -499,8 +499,6 @@ SOONG_ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/soong_zip 
ZIP2ZIP := $(SOONG_HOST_OUT_EXECUTABLES)/zip2zip

FILESLIST := $(SOONG_HOST_OUT_EXECUTABLES)/fileslist



JAVAC_FILTER := $(SOONG_HOST_OUT_EXECUTABLES)/soong_javac_filter



# Always use prebuilts for ckati and makeparallel

prebuilt_build_tools := prebuilts/build-tools

ifeq ($(filter address,$(SANITIZE_HOST)),)

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2219,7 +2219,7 @@ $(if $(PRIVATE_HAS_RS_SOURCES), \ 
$(hide) tr ' ' '\n' < $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list \

    | $(NORMALIZE_PATH) | sort -u > $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq

$(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; then \

    ( $(1) -encoding UTF-8 \

    $(1) -encoding UTF-8 \

    $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \

    $(2) \

    $(addprefix -classpath ,$(strip \
@@ -2228,7 +2228,7 @@ $(hide) if [ -s $(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq ] ; the 
    -extdirs "" -d $(PRIVATE_CLASS_INTERMEDIATES_DIR) \

    $(PRIVATE_JAVACFLAGS) \

    \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq \

    || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) ) 2>&1 | $(JAVAC_FILTER); \

    || ( rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) ; exit 41 ) \

fi

$(if $(PRIVATE_JAVA_LAYERS_FILE), $(hide) build/tools/java-layers.py \

    $(PRIVATE_JAVA_LAYERS_FILE) \@$(PRIVATE_CLASS_INTERMEDIATES_DIR)/java-source-list-uniq,)

core/envsetup.mk

+56 −0
Original line number Diff line number Diff line
@@ -11,9 +11,65 @@ 
#         This can be useful if you set OUT_DIR to be a different directory

#         than other outputs of your build system.



# Returns all words in $1 up to and including $2

define find_and_earlier

  $(strip $(if $(1),

    $(firstword $(1))

    $(if $(filter $(firstword $(1)),$(2)),,

      $(call find_and_earlier,$(wordlist 2,$(words $(1)),$(1)),$(2)))))

endef



#$(warning $(call find_and_earlier,A B C,A))

#$(warning $(call find_and_earlier,A B C,B))

#$(warning $(call find_and_earlier,A B C,C))

#$(warning $(call find_and_earlier,A B C,D))



define version-list

$(1)PR1 $(1)PD1 $(1)PD2 $(1)PM1 $(1)PM2

endef



ALL_VERSIONS := O P Q R S T U V W X Y Z

ALL_VERSIONS := $(foreach v,$(ALL_VERSIONS),$(call version-list,$(v)))



# Filters ALL_VERSIONS down to the range [$1, $2], and errors if $1 > $2 or $3 is

# not in [$1, $2]

# $(1): min platform version

# $(2): max platform version

# $(3): default platform version

define allowed-platform-versions

$(strip \

  $(if $(filter $(ALL_VERSIONS),$(1)),,

    $(error Invalid MIN_PLATFORM_VERSION '$(1)'))

  $(if $(filter $(ALL_VERSIONS),$(2)),,

    $(error Invalid MAX_PLATFORM_VERSION '$(2)'))

  $(if $(filter $(ALL_VERSIONS),$(3)),,

    $(error Invalid DEFAULT_PLATFORM_VERSION '$(3)'))



  $(eval allowed_versions_ := $(call find_and_earlier,$(ALL_VERSIONS),$(2)))



  $(if $(filter $(allowed_versions_),$(1)),,

    $(error MIN_PLATFORM_VERSION '$(1)' must be before MAX_PLATFORM_VERSION '$(2)'))



  $(eval allowed_versions_ := $(1) \

    $(filter-out $(call find_and_earlier,$(allowed_versions_),$(1)),$(allowed_versions_)))



  $(if $(filter $(allowed_versions_),$(3)),,

    $(error DEFAULT_PLATFORM_VERSION '$(3)' must be between MIN_PLATFORM_VERSION '$(1)' and MAX_PLATFORM_VERSION '$(2)'))



  $(allowed_versions_))

endef



#$(warning $(call allowed-platform-versions,OPR1,PPR1,OPR1))

#$(warning $(call allowed-platform-versions,OPM1,PPR1,OPR1))



# Set up version information.

include $(BUILD_SYSTEM)/version_defaults.mk



ENABLED_VERSIONS := $(call find_and_earlier,$(ALL_VERSIONS),$(TARGET_PLATFORM_VERSION))



$(foreach v,$(ENABLED_VERSIONS), \

  $(eval IS_AT_LEAST_$(v) := true))



# ---------------------------------------------------------------

# If you update the build system such that the environment setup

# or buildspec.mk need to be updated, increment this number, and

core/host_dalvik_java_library.mk

+2 −8
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ $(full_classes_compiled_jar): \ 
        $(full_java_lib_deps) \

        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)
@@ -120,14 +118,10 @@ $(full_classes_jarjar_jar): $(full_classes_desugar_jar) $(LOCAL_JARJAR_RULES) | 
	@echo JarJar: $@

	$(hide) java -jar $(JARJAR) process $(PRIVATE_JARJAR_RULES) $< $@

else

$(full_classes_jarjar_jar): $(full_classes_desugar_jar) | $(ACP)

	@echo Copying: $@

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

full_classes_jarjar_jar := $(full_classes_desugar_jar)

endif



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

	@echo Copying: $@

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

$(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.

core/host_java_library.mk

+4 −12
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ $(full_classes_compiled_jar): \ 
        $(jar_manifest_file) \

        $(proto_java_sources_file_stamp) \

        $(NORMALIZE_PATH) \

        $(JAVAC_FILTER) \

        $(LOCAL_ADDITIONAL_DEPENDENCIES)

	$(transform-host-java-to-package)
@@ -88,9 +87,7 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) $(LOCAL_JARJAR_RULES) | 
	@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 $< $@

full_classes_jarjar_jar := $(full_classes_compiled_jar)

endif



ifeq (true,$(LOCAL_EMMA_INSTRUMENT))
@@ -107,13 +104,8 @@ endif 
# $(full_classes_emma_jar)

$(full_classes_emma_jar) : $(full_classes_jarjar_jar) | $(EMMA_JAR)

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



$(LOCAL_BUILT_MODULE) : $(full_classes_emma_jar)

	@echo Copying: $@

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



else # LOCAL_EMMA_INSTRUMENT

$(LOCAL_BUILT_MODULE) : $(full_classes_jarjar_jar) | $(ACP)

	@echo Copying: $@

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

full_classes_emma_jar := $(full_classes_jarjar_jar)

endif # LOCAL_EMMA_INSTRUMENT



$(eval $(call copy-one-file,$(full_classes_emma_jar),$(LOCAL_BUILT_MODULE)))