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

Commit b8901d7f authored by Colin Cross's avatar Colin Cross
Browse files

Revert "Move dexpreopting to Soong" 

This reverts commit e736c580.

Test: none
Bug: 119412419
parent 7f9ccd53

core/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -2158,9 +2158,9 @@ stnod: systemtarball-nodeps 
## Files under out dir will be rejected to prevent possible conflicts with other rules.

ifneq (,$(BUILD_PLATFORM_ZIP))

pdk_odex_javalibs := $(strip $(foreach m,$(DEXPREOPT.MODULES.JAVA_LIBRARIES),\

  $(if $(filter $(DEXPREOPT.$(m).INSTALLED_STRIPPED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))

  $(if $(filter $(DEXPREOPT.$(m).INSTALLED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))

pdk_odex_apps := $(strip $(foreach m,$(DEXPREOPT.MODULES.APPS),\

  $(if $(filter $(DEXPREOPT.$(m).INSTALLED_STRIPPED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))

  $(if $(filter $(DEXPREOPT.$(m).INSTALLED),$(ALL_DEFAULT_INSTALLED_MODULES)),$(m))))

pdk_classes_dex := $(strip \

  $(foreach m,$(pdk_odex_javalibs),$(call intermediates-dir-for,JAVA_LIBRARIES,$(m),,COMMON)/javalib.jar) \

  $(foreach m,$(pdk_odex_apps),$(call intermediates-dir-for,APPS,$(m))/package.dex.apk))
@@ -2446,9 +2446,6 @@ INTERNAL_SYSTEMOTHERIMAGE_FILES := \ 
      $(ALL_PDK_FUSION_FILES)) \

    $(PDK_FUSION_SYMLINK_STAMP)



# system_other dex files are installed as a side-effect of installing system image files

INTERNAL_SYSTEMOTHERIMAGE_FILES += $(INTERNAL_SYSTEMIMAGE_FILES)



INSTALLED_FILES_FILE_SYSTEMOTHER := $(PRODUCT_OUT)/installed-files-system-other.txt

INSTALLED_FILES_JSON_SYSTEMOTHER := $(INSTALLED_FILES_FILE_SYSTEMOTHER:.txt=.json)

$(INSTALLED_FILES_FILE_SYSTEMOTHER): .KATI_IMPLICIT_OUTPUTS := $(INSTALLED_FILES_JSON_SYSTEMOTHER)

core/clear_vars.mk

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ LOCAL_SDK_VERSION:= 
LOCAL_SHARED_ANDROID_LIBRARIES:=

LOCAL_SHARED_LIBRARIES:=

LOCAL_SOONG_AAR :=

LOCAL_SOONG_BUILT_INSTALLED :=

LOCAL_SOONG_BUNDLE :=

LOCAL_SOONG_CLASSES_JAR :=

LOCAL_SOONG_DEX_JAR :=
@@ -279,6 +278,7 @@ LOCAL_STATIC_ANDROID_LIBRARIES:= 
LOCAL_STATIC_JAVA_AAR_LIBRARIES:=

LOCAL_STATIC_JAVA_LIBRARIES:=

LOCAL_STATIC_LIBRARIES:=

LOCAL_STRIP_DEX:=

LOCAL_STRIP_MODULE:=

LOCAL_SYSTEM_SHARED_LIBRARIES:=none

LOCAL_TARGET_REQUIRED_MODULES:=

core/config.mk

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ include $(BUILD_SYSTEM_COMMON)/math.mk 


include $(BUILD_SYSTEM_COMMON)/strings.mk



include $(BUILD_SYSTEM_COMMON)/json.mk



# Various mappings to avoid hard-coding paths all over the place

include $(BUILD_SYSTEM)/pathmap.mk

core/dex_preopt.mk

+67 −3
Original line number Diff line number Diff line
@@ -3,7 +3,31 @@ 
#

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



include $(BUILD_SYSTEM)/dex_preopt_config.mk

# list of boot classpath jars for dexpreopt

DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))

DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS)

PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar))



PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar))



DEXPREOPT_BUILD_DIR := $(OUT_DIR)

DEXPREOPT_PRODUCT_DIR_FULL_PATH := $(PRODUCT_OUT)/dex_bootjars

DEXPREOPT_PRODUCT_DIR := $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(DEXPREOPT_PRODUCT_DIR_FULL_PATH))

DEXPREOPT_BOOT_JAR_DIR := system/framework

DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR)



# The default value for LOCAL_DEX_PREOPT

DEX_PREOPT_DEFAULT ?= true



# The default filter for which files go into the system_other image (if it is

# being used). To bundle everything one should set this to '%'

SYSTEM_OTHER_ODEX_FILTER ?= \

    app/% \

    priv-app/% \

    product_services/app/% \

    product_services/priv-app/% \

    product/app/% \

    product/priv-app/% \



# Method returning whether the install path $(1) should be for system_other.

# Under SANITIZE_LITE, we do not want system_other. Just put things under /data/asan.
@@ -13,6 +37,35 @@ else 
install-on-system-other = $(filter-out $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1)))))

endif



# The default values for pre-opting: always preopt PIC.

# Conditional to building on linux, as dex2oat currently does not work on darwin.

ifeq ($(HOST_OS),linux)

  WITH_DEXPREOPT ?= true

  ifeq (eng,$(TARGET_BUILD_VARIANT))

    # Don't strip for quick development turnarounds.

    DEX_PREOPT_DEFAULT := nostripping

    # For an eng build only pre-opt the boot image and system server. This gives reasonable performance

    # and still allows a simple workflow: building in frameworks/base and syncing.

    WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true

  endif

  # Add mini-debug-info to the boot classpath unless explicitly asked not to.

  ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))

    PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info

  endif



  # Non eng linux builds must have preopt enabled so that system server doesn't run as interpreter

  # only. b/74209329

  ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))

    ifneq (true,$(WITH_DEXPREOPT))

      ifneq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))

        $(call pretty-error, DEXPREOPT must be enabled for user and userdebug builds)

      endif

    endif

  endif

endif



GLOBAL_DEXPREOPT_FLAGS :=



# Special rules for building stripped boot jars that override java_library.mk rules



# $(1): boot jar module name
@@ -30,6 +83,19 @@ $(foreach b,$(DEXPREOPT_BOOT_JARS_MODULES),$(eval $(call _dexpreopt-boot-jar-rem 


include $(BUILD_SYSTEM)/dex_preopt_libart.mk



# Define dexpreopt-one-file based on current default runtime.

# $(1): the input .jar or .apk file

# $(2): the output .odex file

define dexpreopt-one-file

$(call dex2oat-one-file,$(1),$(2))

endef



DEXPREOPT_ONE_FILE_DEPENDENCY_TOOLS := $(DEX2OAT_DEPENDENCY)

DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $(DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

ifdef TARGET_2ND_ARCH

$(TARGET_2ND_ARCH_VAR_PREFIX)DEXPREOPT_ONE_FILE_DEPENDENCY_BUILT_BOOT_PREOPT := $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

endif  # TARGET_2ND_ARCH



# === hiddenapi rules ===



hiddenapi_stubs_jar = $(call intermediates-dir-for,JAVA_LIBRARIES,$(1),,COMMON)/javalib.jar
@@ -83,8 +149,6 @@ $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(HIDDENAPI) $(HIDDENAPI_STUBS) \ 
	$(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST))

	$(call commit-change-for-toc,$(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST))







ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)

boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip

all_boot_jars := \

core/dex_preopt_config.mk

deleted100644 → 0
+0 −200
Original line number Diff line number Diff line 
DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config



# list of boot classpath jars for dexpreopt

DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))

DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS)

PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar))



PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar))



DEXPREOPT_BUILD_DIR := $(OUT_DIR)

DEXPREOPT_PRODUCT_DIR_FULL_PATH := $(PRODUCT_OUT)/dex_bootjars

DEXPREOPT_PRODUCT_DIR := $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(DEXPREOPT_PRODUCT_DIR_FULL_PATH))

DEXPREOPT_BOOT_JAR_DIR := system/framework

DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR)



DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art

DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(DEX2OAT_TARGET_ARCH)/boot.art



ifdef TARGET_2ND_ARCH

  $(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art

  $(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_ARCH)/boot.art

endif



# The default value for LOCAL_DEX_PREOPT

DEX_PREOPT_DEFAULT ?= true



# The default filter for which files go into the system_other image (if it is

# being used). To bundle everything one should set this to '%'

SYSTEM_OTHER_ODEX_FILTER ?= \

    app/% \

    priv-app/% \

    product_services/app/% \

    product_services/priv-app/% \

    product/app/% \

    product/priv-app/% \



# The default values for pre-opting: always preopt PIC.

# Conditional to building on linux, as dex2oat currently does not work on darwin.

ifeq ($(HOST_OS),linux)

  WITH_DEXPREOPT ?= true

  ifeq (eng,$(TARGET_BUILD_VARIANT))

    # Don't strip for quick development turnarounds.

    DEX_PREOPT_DEFAULT := nostripping

    # For an eng build only pre-opt the boot image and system server. This gives reasonable performance

    # and still allows a simple workflow: building in frameworks/base and syncing.

    WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY ?= true

  endif

  # Add mini-debug-info to the boot classpath unless explicitly asked not to.

  ifneq (false,$(WITH_DEXPREOPT_DEBUG_INFO))

    PRODUCT_DEX_PREOPT_BOOT_FLAGS += --generate-mini-debug-info

  endif



  # Non eng linux builds must have preopt enabled so that system server doesn't run as interpreter

  # only. b/74209329

  ifeq (,$(filter eng, $(TARGET_BUILD_VARIANT)))

    ifneq (true,$(WITH_DEXPREOPT))

      ifneq (true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY))

        $(call pretty-error, DEXPREOPT must be enabled for user and userdebug builds)

      endif

    endif

  endif

endif



# Default to debug version to help find bugs.

# Set USE_DEX2OAT_DEBUG to false for only building non-debug versions.

ifeq ($(USE_DEX2OAT_DEBUG),false)

DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oat$(HOST_EXECUTABLE_SUFFIX)

else

DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX)

endif



DEX2OAT_DEPENDENCY += $(DEX2OAT)



# Use the first preloaded-classes file in PRODUCT_COPY_FILES.

PRELOADED_CLASSES := $(call word-colon,1,$(firstword \

    $(filter %system/etc/preloaded-classes,$(PRODUCT_COPY_FILES))))



# Use the first dirty-image-objects file in PRODUCT_COPY_FILES.

DIRTY_IMAGE_OBJECTS := $(call word-colon,1,$(firstword \

    $(filter %system/etc/dirty-image-objects,$(PRODUCT_COPY_FILES))))



define get-product-default-property

$(strip \

  $(eval _prop := $(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_DEFAULT_PROPERTY_OVERRIDES))))\

  $(if $(_prop),$(_prop),$(patsubst $(1)=%,%,$(filter $(1)=%,$(PRODUCT_SYSTEM_DEFAULT_PROPERTIES)))))

endef



DEX2OAT_IMAGE_XMS := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xms)

DEX2OAT_IMAGE_XMX := $(call get-product-default-property,dalvik.vm.image-dex2oat-Xmx)

DEX2OAT_XMS := $(call get-product-default-property,dalvik.vm.dex2oat-Xms)

DEX2OAT_XMX := $(call get-product-default-property,dalvik.vm.dex2oat-Xmx)



ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),mips mips64))

# MIPS specific overrides.

# For MIPS the ART image is loaded at a lower address. This causes issues

# with the image overlapping with memory on the host cross-compiling and

# building the image. We therefore limit the Xmx value. This isn't done

# via a property as we want the larger Xmx value if we're running on a

# MIPS device.

DEX2OAT_XMX := 128m

endif



ifeq ($(WRITE_SOONG_VARIABLES),true)



  $(call json_start)



  $(call add_json_bool, DefaultNoStripping,                 $(filter nostripping,$(DEX_PREOPT_DEFAULT)))

  $(call add_json_list, DisablePreoptModules,               $(DEXPREOPT_DISABLED_MODULES))

  $(call add_json_bool, OnlyPreoptBootImageAndSystemServer, $(filter true,$(WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY)))

  $(call add_json_bool, DontUncompressPrivAppsDex,          $(filter true,$(DONT_UNCOMPRESS_PRIV_APPS_DEXS)))

  $(call add_json_list, ModulesLoadedByPrivilegedModules,   $(PRODUCT_LOADED_BY_PRIVILEGED_MODULES))

  $(call add_json_bool, HasSystemOther,                     $(BOARD_USES_SYSTEM_OTHER_ODEX))

  $(call add_json_list, PatternsOnSystemOther,              $(SYSTEM_OTHER_ODEX_FILTER))

  $(call add_json_bool, DisableGenerateProfile,             $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))

  $(call add_json_list, BootJars,                           $(DEXPREOPT_BOOT_JARS_MODULES))

  $(call add_json_list, SystemServerJars,                   $(PRODUCT_SYSTEM_SERVER_JARS))

  $(call add_json_list, SystemServerApps,                   $(PRODUCT_SYSTEM_SERVER_APPS))

  $(call add_json_list, SpeedApps,                          $(PRODUCT_DEXPREOPT_SPEED_APPS))

  $(call add_json_list, PreoptFlags,                        $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS))

  $(call add_json_str,  DefaultCompilerFilter,              $(PRODUCT_DEX_PREOPT_DEFAULT_COMPILER_FILTER))

  $(call add_json_str,  SystemServerCompilerFilter,         $(PRODUCT_SYSTEM_SERVER_COMPILER_FILTER))

  $(call add_json_bool, GenerateDmFiles,                    $(PRODUCT_DEX_PREOPT_GENERATE_DM_FILES))

  $(call add_json_bool, NoDebugInfo,                        $(filter false,$(WITH_DEXPREOPT_DEBUG_INFO)))

  $(call add_json_bool, AlwaysSystemServerDebugInfo,        $(filter true,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO)))

  $(call add_json_bool, NeverSystemServerDebugInfo,         $(filter false,$(PRODUCT_SYSTEM_SERVER_DEBUG_INFO)))

  $(call add_json_bool, AlwaysOtherDebugInfo,               $(filter true,$(PRODUCT_OTHER_JAVA_DEBUG_INFO)))

  $(call add_json_bool, NeverOtherDebugInfo,                $(filter false,$(PRODUCT_OTHER_JAVA_DEBUG_INFO)))

  $(call add_json_list, MissingUsesLibraries,               $(INTERNAL_PLATFORM_MISSING_USES_LIBRARIES))

  $(call add_json_bool, IsEng,                              $(filter eng,$(TARGET_BUILD_VARIANT)))

  $(call add_json_bool, SanitizeLite,                       $(SANITIZE_LITE))

  $(call add_json_bool, DefaultAppImages,                   $(WITH_DEX_PREOPT_APP_IMAGE))

  $(call add_json_str,  Dex2oatXmx,                         $(DEX2OAT_XMX))

  $(call add_json_str,  Dex2oatXms,                         $(DEX2OAT_XMS))

  $(call add_json_str,  EmptyDirectory,                     $(OUT_DIR)/empty)



  $(call add_json_map,  DefaultDexPreoptImageLocation)

  $(call add_json_str,  $(TARGET_ARCH), $(DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION))

  ifdef TARGET_2ND_ARCH

    $(call add_json_str, $(TARGET_2ND_ARCH), $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION))

  endif

  $(call end_json_map)



  $(call add_json_map,  CpuVariant)

  $(call add_json_str,  $(TARGET_ARCH), $(DEX2OAT_TARGET_CPU_VARIANT))

  ifdef TARGET_2ND_ARCH

    $(call add_json_str, $(TARGET_2ND_ARCH), $($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT))

  endif

  $(call end_json_map)



  $(call add_json_map,  InstructionSetFeatures)

  $(call add_json_str,  $(TARGET_ARCH), $(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES))

  ifdef TARGET_2ND_ARCH

    $(call add_json_str, $(TARGET_2ND_ARCH), $($(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES))

  endif

  $(call end_json_map)



  $(call add_json_map,  Tools)

  $(call add_json_str,  Profman,                            $(PROFMAN))

  $(call add_json_str,  Dex2oat,                            $(DEX2OAT))

  $(call add_json_str,  Aapt,                               $(AAPT))

  $(call add_json_str,  SoongZip,                           $(SOONG_ZIP))

  $(call add_json_str,  Zip2zip,                            $(ZIP2ZIP))

  $(call add_json_str,  VerifyUsesLibraries,                $(BUILD_SYSTEM)/verify_uses_libraries.sh)

  $(call add_json_str,  ConstructContext,                   $(BUILD_SYSTEM)/construct_context.sh)

  $(call end_json_map)



  $(call json_end)



  $(shell mkdir -p $(dir $(DEX_PREOPT_CONFIG)))

  $(file >$(DEX_PREOPT_CONFIG).tmp,$(json_contents))



  $(shell \

    if ! cmp -s $(DEX_PREOPT_CONFIG).tmp $(DEX_PREOPT_CONFIG); then \

      mv $(DEX_PREOPT_CONFIG).tmp $(DEX_PREOPT_CONFIG); \

    else \

      rm $(DEX_PREOPT_CONFIG).tmp; \

    fi)

endif



# Dummy rule to create dexpreopt.config, it will already have been created

# by the $(file) call above, but a rule needs to exist to keep the dangling

# rule check happy.

$(DEX_PREOPT_CONFIG):

	@#empty



DEXPREOPT_GEN_DEPS := \

  $(PROFMAN) \

  $(DEX2OAT) \

  $(AAPT) \

  $(SOONG_ZIP) \

  $(ZIP2ZIP) \

  $(BUILD_SYSTEM)/verify_uses_libraries.sh \

  $(BUILD_SYSTEM)/construct_context.sh \



DEXPREOPT_GEN_DEPS += $(DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

ifdef TARGET_2ND_ARCH

  ifneq ($(TARGET_TRANSLATE_2ND_ARCH),true)

    DEXPREOPT_GEN_DEPS += $($(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME)

  endif

endif