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

Commit 89ec496f authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Remove services, wifi, ethernet from BOOTCLASSPATH. 

They belong to the system_server classpath.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
parent 7a864ea1

core/dex_preopt.mk

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 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))

core/product.mk

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ _product_var_list := \ 
    PRODUCT_SUPPORTS_VERITY \

    PRODUCT_OEM_PROPERTIES \

    PRODUCT_SYSTEM_PROPERTY_BLACKLIST \

    PRODUCT_SYSTEM_SERVER_JARS \

    PRODUCT_VERITY_SIGNING_KEY \

    PRODUCT_SYSTEM_VERITY_PARTITION \

    PRODUCT_VENDOR_VERITY_PARTITION
@@ -217,6 +218,7 @@ endef 


_product_stash_var_list := $(_product_var_list) \

	PRODUCT_BOOTCLASSPATH \

	PRODUCT_SYSTEM_SERVER_CLASSPATH \

	TARGET_ARCH \

	TARGET_ARCH_VARIANT \

	TARGET_CPU_VARIANT \

core/product_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ endif 


# A list of module names of BOOTCLASSPATH (jar files)

PRODUCT_BOOT_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS))

PRODUCT_SYSTEM_SERVER_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_JARS))



# Find the device that this product maps to.

TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE)

target/product/core_minimal.mk

+4 −1
Original line number Diff line number Diff line
@@ -89,8 +89,11 @@ PRODUCT_BOOT_JARS := \ 
    ims-common \

    mms-common \

    android.policy \

    services \

    apache-xml \



# The order of PRODUCT_SYSTEM_SERVER_JARS matters.

PRODUCT_SYSTEM_SERVER_JARS := \

    services \

    ethernet-service \

    wifi-service

target/product/core_tiny.mk

+4 −1
Original line number Diff line number Diff line
@@ -92,9 +92,12 @@ PRODUCT_BOOT_JARS := \ 
    ims-common \

    mms-common \

    android.policy \

    services \

    apache-xml \

    nullwebview \



# The order of PRODUCT_SYSTEM_SERVER_JARS matters.

PRODUCT_SYSTEM_SERVER_JARS := \

    services \

    wifi-service



PRODUCT_RUNTIMES := runtime_libart_default