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

Commit d75b4e61 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Rename product_services to system_ext" am: b7a50ece am: 8f11ad5d 

am: fe113213

Change-Id: I71e891ed502e8708bc1eb9c82a15180af9e679f3
parents 451f1950 fe113213

core/Makefile

+135 −147

File changed.

Preview size limit exceeded, changes collapsed.

core/app_prebuilt_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ endif # LOCAL_COMPRESSED_MODULE 
include $(BUILD_SYSTEM)/base_rules.mk

built_module := $(LOCAL_BUILT_MODULE)



# Run veridex on product, product_services and vendor modules.

# Run veridex on product, system_ext and vendor modules.

# We skip it for unbundled app builds where we cannot build veridex.

module_run_appcompat :=

ifeq (true,$(non_system_module))

core/base_rules.mk

+11 −5
Original line number Diff line number Diff line
@@ -81,11 +81,17 @@ else ifneq ($(filter $(TARGET_OUT_ODM)/%,$(_path)),) 
LOCAL_ODM_MODULE := true

else ifneq ($(filter $(TARGET_OUT_PRODUCT)/%,$(_path)),)

LOCAL_PRODUCT_MODULE := true

else ifneq ($(filter $(TARGET_OUT_PRODUCT_SERVICES)/%,$(_path)),)

LOCAL_PRODUCT_SERVICES_MODULE := true

else ifneq ($(filter $(TARGET_OUT_SYSTEM_EXT)/%,$(_path)),)

LOCAL_SYSTEM_EXT_MODULE := true

endif

_path :=



# TODO(b/135957588) Remove following workaround

# LOCAL_PRODUCT_SERVICES_MODULE to LOCAL_PRODUCT_MODULE for all Android.mk

ifndef LOCAL_PRODUCT_MODULE

LOCAL_PRODUCT_MODULE := $(LOCAL_PRODUCT_SERVICES_MODULE)

endif



ifndef LOCAL_PROPRIETARY_MODULE

  LOCAL_PROPRIETARY_MODULE := $(LOCAL_VENDOR_MODULE)

endif
@@ -98,7 +104,7 @@ endif 


non_system_module := $(filter true, \

   $(LOCAL_PRODUCT_MODULE) \

   $(LOCAL_PRODUCT_SERVICES_MODULE) \

   $(LOCAL_SYSTEM_EXT_MODULE) \

   $(LOCAL_VENDOR_MODULE) \

   $(LOCAL_PROPRIETARY_MODULE))
@@ -227,8 +233,8 @@ else ifeq (true,$(strip $(LOCAL_ODM_MODULE))) 
  partition_tag := _ODM

else ifeq (true,$(strip $(LOCAL_PRODUCT_MODULE)))

  partition_tag := _PRODUCT

else ifeq (true,$(strip $(LOCAL_PRODUCT_SERVICES_MODULE)))

  partition_tag := _PRODUCT_SERVICES

else ifeq (true,$(strip $(LOCAL_SYSTEM_EXT_MODULE)))

  partition_tag := _SYSTEM_EXT

else ifeq (NATIVE_TESTS,$(LOCAL_MODULE_CLASS))

  partition_tag := _DATA

else

core/board_config.mk

+41 −41
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ _board_strip_readonly_list += \ 
  BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE \

  BOARD_PRODUCTIMAGE_PARTITION_SIZE \

  BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE \

  BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE \

  BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE \

  BOARD_SYSTEM_EXTIMAGE_PARTITION_SIZE \

  BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE \

  BOARD_ODMIMAGE_PARTITION_SIZE \

  BOARD_ODMIMAGE_FILE_SYSTEM_TYPE \
@@ -78,7 +78,7 @@ _dynamic_partitions_var_list += \ 
  BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_PRODUCT_SERVICESIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE \

  BOARD_SUPER_PARTITION_SIZE \

  BOARD_SUPER_PARTITION_GROUPS \
@@ -413,48 +413,48 @@ endif 
.KATI_READONLY := BUILDING_PRODUCT_IMAGE



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

# Now we can substitute with the real value of TARGET_COPY_OUT_PRODUCT_SERVICES

MERGE_PRODUCT_SERVICES_INTO_PRODUCT :=

ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder))

# TODO(b/135957588) TARGET_COPY_OUT_PRODUCT_SERVICES will be set to

# TARGET_COPY_OUT_PRODUCT as a workaround.

TARGET_COPY_OUT_PRODUCT_SERVICES := $(TARGET_COPY_OUT_PRODUCT)

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

else ifeq ($(TARGET_COPY_OUT_PRODUCT),$(TARGET_COPY_OUT_PRODUCT_SERVICES))

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

else ifeq ($(filter product_services system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),)

  $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either 'product_services',\

    '$(TARGET_COPY_OUT_PRODUCT)' or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.)



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

# Now we can substitute with the real value of TARGET_COPY_OUT_SYSTEM_EXT

ifeq ($(TARGET_COPY_OUT_SYSTEM_EXT),$(_system_ext_path_placeholder))

TARGET_COPY_OUT_SYSTEM_EXT := system/system_ext

else ifeq ($(filter system_ext system/system_ext,$(TARGET_COPY_OUT_SYSTEM_EXT)),)

$(error TARGET_COPY_OUT_SYSTEM_EXT must be either 'system_ext' or 'system/system_ext', seeing '$(TARGET_COPY_OUT_SYSTEM_EXT)'.)

endif

.KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT

PRODUCT_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_COPY_FILES))

PRODUCT_COPY_FILES := $(subst $(_system_ext_path_placeholder),$(TARGET_COPY_OUT_SYSTEM_EXT),$(PRODUCT_COPY_FILES))



BOARD_USES_PRODUCT_SERVICESIMAGE :=

ifdef BOARD_PREBUILT_PRODUCT_SERVICESIMAGE

  BOARD_USES_PRODUCT_SERVICESIMAGE := true

BOARD_USES_SYSTEM_EXTIMAGE :=

ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE

  BOARD_USES_SYSTEM_EXTIMAGE := true

endif

ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE

  BOARD_USES_PRODUCT_SERVICESIMAGE := true

ifdef BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE

  BOARD_USES_SYSTEM_EXTIMAGE := true

endif

ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services)

  BOARD_USES_PRODUCT_SERVICESIMAGE := true

else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE

  $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be set to 'product_services' to use a product_services image)

ifeq ($(TARGET_COPY_OUT_SYSTEM_EXT),system_ext)

  BOARD_USES_SYSTEM_EXTIMAGE := true

else ifdef BOARD_USES_SYSTEM_EXTIMAGE

  $(error TARGET_COPY_OUT_SYSTEM_EXT must be set to 'system_ext' to use a system_ext image)

endif

.KATI_READONLY := BOARD_USES_SYSTEM_EXTIMAGE



BUILDING_PRODUCT_SERVICES_IMAGE :=

ifeq ($(PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE),)

  ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE

    BUILDING_PRODUCT_SERVICES_IMAGE := true

BUILDING_SYSTEM_EXT_IMAGE :=

ifeq ($(PRODUCT_BUILD_SYSTEM_EXT_IMAGE),)

  ifdef BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE

    BUILDING_SYSTEM_EXT_IMAGE := true

  endif

else ifeq ($(PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE),true)

  BUILDING_PRODUCT_SERVICES_IMAGE := true

  ifndef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE

    $(error PRODUCT_BUILD_PRODUCT_SERVICES_IMAGE set to true, but BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE not defined)

else ifeq ($(PRODUCT_BUILD_SYSTEM_EXT_IMAGE),true)

  BUILDING_SYSTEM_EXT_IMAGE := true

  ifndef BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE

    $(error PRODUCT_BUILD_SYSTEM_EXT_IMAGE set to true, but BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE not defined)

  endif

endif

ifdef BOARD_PREBUILT_PRODUCT_SERVICESIMAGE

  BUILDING_PRODUCT_SERVICES_IMAGE :=

ifdef BOARD_PREBUILT_SYSTEM_EXTIMAGE

  BUILDING_SYSTEM_EXT_IMAGE :=

endif

.KATI_READONLY := BUILDING_PRODUCT_SERVICES_IMAGE

.KATI_READONLY := BUILDING_SYSTEM_EXT_IMAGE



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

# Now we can substitute with the real value of TARGET_COPY_OUT_ODM

core/build_rro_package.mk

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ ifeq ($(strip $(LOCAL_ODM_MODULE)),true) 
  partition := $(TARGET_OUT_ODM)

else ifeq ($(strip $(LOCAL_VENDOR_MODULE)),true)

  partition := $(TARGET_OUT_VENDOR)

else ifeq ($(strip $(LOCAL_PRODUCT_SERVICES_MODULE)),true)

  partition := $(TARGET_OUT_PRODUCT_SERVICES)

else ifeq ($(strip $(LOCAL_SYSTEM_EXT_MODULE)),true)

  partition := $(TARGET_OUT_SYSTEM_EXT)

else

  partition := $(TARGET_OUT_PRODUCT)

endif