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

Commit b334d171 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "revert-soong-dexpreopt" 

* changes:
  Revert "Move dexpreopting to Soong"
  Revert "Add missing dependency on zip2zip"
  Revert "Create directories before unzipping dexpreopt zip"
  Revert "Correctly create directories before unzipping dexpreopt zip"
parents 9c9ea97f b8901d7f

CleanSpec.mk

+0 −3
Original line number Diff line number Diff line
@@ -525,9 +525,6 @@ $(call add-clean-step, rm -f $(HOST_OUT)/bin/aidegen) 
# Remove perfprofd

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/perfprofd)



# Remove incorrectly created directories in the source tree

$(call add-clean-step, find system/app system/priv-app system/framework system_other -depth -type d -print0 | xargs -0 rmdir)



# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

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 := \