diff options
| author | Narayan Kamath <narayan@google.com> | 2014-08-05 14:51:08 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-08-12 10:25:19 +0100 |
| commit | 89ec496f989c44315b25ec08915d847edd322739 (patch) | |
| tree | 64a3e4a0d4472db339a80e2f26efcdd274d4a186 | |
| parent | 7a864ea196bbf8583caf7e8a09cf4f686ff724fd (diff) | |
| download | build-89ec496f989c44315b25ec08915d847edd322739.zip build-89ec496f989c44315b25ec08915d847edd322739.tar.gz build-89ec496f989c44315b25ec08915d847edd322739.tar.bz2 | |
Remove services, wifi, ethernet from BOOTCLASSPATH.
They belong to the system_server classpath.
bug: 16555230
Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
| -rw-r--r-- | core/dex_preopt.mk | 2 | ||||
| -rw-r--r-- | core/product.mk | 2 | ||||
| -rw-r--r-- | core/product_config.mk | 1 | ||||
| -rw-r--r-- | target/product/core_minimal.mk | 5 | ||||
| -rw-r--r-- | target/product/core_tiny.mk | 5 |
5 files changed, 13 insertions, 2 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index 76fc130..8a19b66 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -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)) diff --git a/core/product.mk b/core/product.mk index 89d5982..91aa2b5 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 \ diff --git a/core/product_config.mk b/core/product_config.mk index 261b935..48f47eb 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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) diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk index b0e3c5a..c03ade4 100644 --- a/target/product/core_minimal.mk +++ b/target/product/core_minimal.mk @@ -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 diff --git a/target/product/core_tiny.mk b/target/product/core_tiny.mk index d6e4dc5..d6dbe98 100644 --- a/target/product/core_tiny.mk +++ b/target/product/core_tiny.mk @@ -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 |