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

Commit 0a69bb6c authored by Colin Cross's avatar Colin Cross
Browse files

Indent dex_preopt_odex_install.mk 

Test: m checkbuild
Change-Id: I7743fbda98d1f1ea1d3e8242905239ff0115b6a9
parent cb846fa6

core/dex_preopt_odex_install.mk

+272 −271
Original line number Diff line number Diff line
@@ -49,12 +49,15 @@ endif # WITH_DEXPREOPT=true 
ifeq (false,$(LOCAL_DEX_PREOPT))

  LOCAL_DEX_PREOPT :=

endif



ifdef LOCAL_UNINSTALLABLE_MODULE

  LOCAL_DEX_PREOPT :=

endif



ifeq (,$(strip $(built_dex)$(my_prebuilt_src_file)$(LOCAL_SOONG_DEX_JAR))) # contains no java code

  LOCAL_DEX_PREOPT :=

endif



# if WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY=true and module is not in boot class path skip

# Also preopt system server jars since selinux prevents system server from loading anything from

# /data. If we don't do this they will need to be extracted which is not favorable for RAM usage
@@ -69,7 +72,6 @@ endif 
endif



ifeq ($(LOCAL_DEX_PREOPT),true)



  # Don't strip with dexes we explicitly uncompress (dexopt will not store the dex code).

  ifeq ($(LOCAL_UNCOMPRESS_DEX),true)

    LOCAL_DEX_PREOPT := nostripping
@@ -87,7 +89,6 @@ endif # BOARD_USES_SYSTEM_OTHER_ODEX 
  # but that requires to inspect the source file, which is too early at this point (as we

  # don't know if the source file will actually be used).

  # See dexpreopt-remove-classes.dex.



endif  # LOCAL_DEX_PREOPT



built_odex :=
@@ -107,8 +108,6 @@ LOCAL_DEX_PREOPT_GENERATE_PROFILE := false 
endif



ifndef LOCAL_DEX_PREOPT_GENERATE_PROFILE





  # If LOCAL_DEX_PREOPT_GENERATE_PROFILE is not defined, default it based on the existence of the

  # profile class listing. TODO: Use product specific directory here.

  my_classes_directory := $(PRODUCT_DEX_PREOPT_PROFILE_DIR)
@@ -149,6 +148,7 @@ $(my_built_profile): $(dex_preopt_profile_src_file) 
  ifeq (true,$(my_profile_is_text_listing))

    # The profile is a test listing of classes (used for framework jars).

    # We need to generate the actual binary profile before being able to compile.

    $(my_built_profile):

	$(hide) mkdir -p $(dir $@)

	ANDROID_LOG_TAGS="*:e" $(PROFMAN) \

		--create-profile-from=$(PRIVATE_SOURCE_CLASSES) \
@@ -187,6 +187,7 @@ endif 
ifdef LOCAL_DEX_PREOPT



  dexpreopt_boot_jar_module := $(filter $(DEXPREOPT_BOOT_JARS_MODULES),$(LOCAL_MODULE))



  ifdef dexpreopt_boot_jar_module

    # For libart, the boot jars' odex files are replaced by $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE).

    # We use this installed_odex trick to get boot.art installed.