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

Commit cfc3cc9e authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Automerger Merge Worker
Browse files

Merge "Deprecate system server jars defined in Android.mk." am: 75342c19 am:... 

Merge "Deprecate system server jars defined in Android.mk." am: 75342c19 am: b563ae25 am: e735b841 am: dfb7c600

Original change: https://android-review.googlesource.com/c/platform/build/+/1869193

Change-Id: Ia0cfda0783f102dede29427d2443f44e18dd73ba
parents d6dfa2a9 dfb7c600

core/dex_preopt_odex_install.mk

+9 −0
Original line number Diff line number Diff line
@@ -423,6 +423,15 @@ $(eval $(call copy-one-file,$(my_dexpreopt_config),$(my_dexpreopt_config_for_pos 


$(LOCAL_INSTALLED_MODULE): $(my_dexpreopt_config_for_postprocessing)



# System server jars defined in Android.mk are deprecated.

ifneq (true, $(PRODUCT_BROKEN_DEPRECATED_MK_SYSTEM_SERVER_JARS))

  ifneq (,$(filter %:$(LOCAL_MODULE), $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_APEX_SYSTEM_SERVER_JARS)))

    $(error System server jars defined in Android.mk are deprecated. \

      Convert $(LOCAL_MODULE) to Android.bp or temporarily disable the error \

      with 'PRODUCT_BROKEN_DEPRECATED_MK_SYSTEM_SERVER_JARS := true')

  endif

endif



ifdef LOCAL_DEX_PREOPT

  # System server jars must be copied into predefined locations expected by

  # dexpreopt. Copy rule must be exposed to Ninja (as it uses these files as

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ _product_list_vars += PRODUCT_SYSTEM_SERVER_JARS 
_product_list_vars += PRODUCT_APEX_SYSTEM_SERVER_JARS

# If true, then suboptimal order of system server jars does not cause an error.

_product_single_value_vars += PRODUCT_BROKEN_SUBOPTIMAL_ORDER_OF_SYSTEM_SERVER_JARS

# If true, then system server jars defined in Android.mk are supported.

_product_single_value_vars += PRODUCT_BROKEN_DEPRECATED_MK_SYSTEM_SERVER_JARS



# Additional system server jars to be appended at the end of the common list.

# This is necessary to avoid jars reordering due to makefile inheritance order.