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

Commit 77112df7 authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge changes from topics "target-build-unbundled", "unbundled-preopt" 

* changes:
  Disable dexpreopting when TARGET_BUILD_APPS is used.
  Introduce TARGET_BUILD_UNBUNDLED.
parents 9df45f6e f712ba95

core/Makefile

+9 −10
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ $(file >$(PRODUCT_OUT)/.copied_headers_list,$(TARGET_OUT_HEADERS) $(ALL_COPIED_H 


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

# docs/index.html

ifeq (,$(TARGET_BUILD_APPS))

ifeq (,$(TARGET_BUILD_UNBUNDLED))

gen := $(OUT_DOCS)/index.html

ALL_DOCS += $(gen)

$(gen): frameworks/base/docs/docs-redirect-index.html
@@ -3306,7 +3306,7 @@ endif # BOARD_AVB_ENABLE 
# -----------------------------------------------------------------

# Check VINTF of build



ifndef TARGET_BUILD_APPS

ifeq (,$(TARGET_BUILD_UNBUNDLED))

intermediates := $(call intermediates-dir-for,PACKAGING,check_vintf_all)

check_vintf_all_deps :=
@@ -3512,13 +3512,12 @@ check_vintf_has_system := 
check_vintf_common_srcs :=

check_vintf_all_deps :=

intermediates :=

endif # !TARGET_BUILD_APPS

endif # !TARGET_BUILD_UNBUNDLED



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

# Check image sizes <= size of super partition



ifeq (,$(TARGET_BUILD_APPS))

# Do not check for apps-only build

ifeq (,$(TARGET_BUILD_UNBUNDLED))



ifeq (true,$(PRODUCT_BUILD_SUPER_PARTITION))
@@ -3554,7 +3553,7 @@ check-all-partition-sizes-nodeps: 


endif # PRODUCT_BUILD_SUPER_PARTITION



endif # TARGET_BUILD_APPS

endif # !TARGET_BUILD_UNBUNDLED



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

# bring in the installer image generation defines if necessary
@@ -4481,7 +4480,7 @@ endif # build_ota_package 
# A zip of the appcompat directory containing logs

APPCOMPAT_ZIP := $(PRODUCT_OUT)/appcompat.zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifndef TARGET_BUILD_APPS

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(APPCOMPAT_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \
@@ -4510,7 +4509,7 @@ name := $(name)-symbols-$(FILE_NAME_TAG) 


SYMBOLS_ZIP := $(PRODUCT_OUT)/$(name).zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifndef TARGET_BUILD_APPS

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(SYMBOLS_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \
@@ -4536,7 +4535,7 @@ ifeq ($(TARGET_BUILD_TYPE),debug) 
name := $(name)_debug

endif

COVERAGE_ZIP := $(PRODUCT_OUT)/$(name).zip

ifndef TARGET_BUILD_APPS

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(COVERAGE_ZIP): $(INSTALLED_SYSTEMIMAGE_TARGET) \

	    $(INSTALLED_RAMDISK_TARGET) \

	    $(INSTALLED_BOOTIMAGE_TARGET) \
@@ -4611,7 +4610,7 @@ endif # EMMA_INSTRUMENT=true 
#

PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip

# For apps_only build we'll establish the dependency later in build/make/core/main.mk.

ifndef TARGET_BUILD_APPS

ifeq (,$(TARGET_BUILD_UNBUNDLED))

$(PROGUARD_DICT_ZIP): \

    $(INSTALLED_SYSTEMIMAGE_TARGET) \

    $(INSTALLED_RAMDISK_TARGET) \

core/board_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ else 
  endif

endif



ifeq (,$(TARGET_BUILD_APPS))

ifeq (,$(TARGET_BUILD_UNBUNDLED))

ifdef PRODUCT_EXTRA_VNDK_VERSIONS

  $(foreach v,$(PRODUCT_EXTRA_VNDK_VERSIONS),$(call check_vndk_version,$(v)))

endif

core/dex_preopt_config.mk

+10 −1
Original line number Diff line number Diff line 
DEX_PREOPT_CONFIG := $(SOONG_OUT_DIR)/dexpreopt.config



ENABLE_PREOPT := true

ifneq (true,$(filter true,$(WITH_DEXPREOPT)))

  ENABLE_PREOPT :=

else ifneq (true,$(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)))

  ENABLE_PREOPT :=

else ifneq (,$(TARGET_BUILD_APPS))

  ENABLE_PREOPT :=

endif



# The default value for LOCAL_DEX_PREOPT

DEX_PREOPT_DEFAULT ?= true
@@ -60,7 +69,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 


  $(call json_start)



  $(call add_json_bool, DisablePreopt,                           $(call invert_bool,$(and $(filter true,$(PRODUCT_USES_DEFAULT_ART_CONFIG)),$(filter true,$(WITH_DEXPREOPT)))))

  $(call add_json_bool, DisablePreopt,                           $(call invert_bool,$(ENABLE_PREOPT)))

  $(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, UseArtImage,                             $(filter true,$(DEXPREOPT_USE_ART_IMAGE)))

core/envsetup.mk

+15 −1
Original line number Diff line number Diff line
@@ -94,10 +94,24 @@ endif 


TARGET_BUILD_APPS ?=



# Set to true for an unbundled build, i.e. a build without

# support for platform targets like the system image. This also

# disables consistency checks that only apply to full platform

# builds.

TARGET_BUILD_UNBUNDLED ?=



# TARGET_BUILD_APPS implies unbundled build, otherwise we default

# to bundled (i.e. platform targets such as the system image are

# included).

ifneq ($(TARGET_BUILD_APPS),)

  TARGET_BUILD_UNBUNDLED := true

endif



.KATI_READONLY := \

  TARGET_PRODUCT \

  TARGET_BUILD_VARIANT \

  TARGET_BUILD_APPS

  TARGET_BUILD_APPS \

  TARGET_BUILD_UNBUNDLED \



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

# Set up configuration for host machine.  We don't do cross-

core/main.mk

+4 −4
Original line number Diff line number Diff line
@@ -1221,8 +1221,8 @@ ifdef FULL_BUILD 
    endif

  endif



  # Some modules produce only host installed files when building with TARGET_BUILD_APPS

  ifeq ($(TARGET_BUILD_APPS),)

  # Modules may produce only host installed files in unbundled builds.

  ifeq (,$(TARGET_BUILD_UNBUNDLED))

    _modules := $(call resolve-bitness-for-modules,TARGET, \

      $(PRODUCT_PACKAGES) \

      $(PRODUCT_PACKAGES_DEBUG) \
@@ -1611,7 +1611,7 @@ $(eval $(call combine-notice-files, html, \ 
    $(apps_only_installed_files)))





else # TARGET_BUILD_APPS

else ifeq (,$(TARGET_BUILD_UNBUNDLED))

  $(call dist-for-goals, droidcore, \

    $(INTERNAL_UPDATE_PACKAGE_TARGET) \

    $(INTERNAL_OTA_PACKAGE_TARGET) \
@@ -1708,7 +1708,7 @@ else # TARGET_BUILD_APPS 
# Building a full system-- the default is to build droidcore

droid_targets: droidcore dist_files



endif # TARGET_BUILD_APPS

endif # !TARGET_BUILD_UNBUNDLED



.PHONY: docs

docs: $(ALL_DOCS)