build
修訂 | 3590af32af77375fd23be239e3d64b7d8ebaead5 (tree) |
---|---|
時間 | 2017-06-16 05:14:44 |
作者 | android-build-team Robot <android-build-team-robot@goog...> |
Commiter | android-build-team Robot |
Make change and version bump to OPR1.170615.002
Change-Id: I67f775896a067b1c21fccbfff722e3c97c31d486
@@ -18,4 +18,4 @@ | ||
18 | 18 | # (like "CRB01"). It must be a single word, and is |
19 | 19 | # capitalized by convention. |
20 | 20 | |
21 | -export BUILD_ID=OPR1.170615.001 | |
21 | +export BUILD_ID=OPR1.170615.002 |
@@ -24,7 +24,7 @@ DEX_PREOPT_DEFAULT ?= true | ||
24 | 24 | SYSTEM_OTHER_ODEX_FILTER ?= app/% priv-app/% |
25 | 25 | |
26 | 26 | # Method returning whether the install path $(1) should be for system_other. |
27 | -install-on-system-other = $(filter-out $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1))))) | |
27 | +install-on-system-other = $(filter-out $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(basename $(notdir $(filter $(foreach f,$(SYSTEM_OTHER_ODEX_FILTER),$(TARGET_OUT)/$(f)),$(1))))) | |
28 | 28 | |
29 | 29 | # The default values for pre-opting: always preopt PIC. |
30 | 30 | # Conditional to building on linux, as dex2oat currently does not work on darwin. |
@@ -152,8 +152,8 @@ LOCAL_DEX_PREOPT_FLAGS := $(PRODUCT_DEX_PREOPT_DEFAULT_FLAGS) | ||
152 | 152 | endif |
153 | 153 | endif |
154 | 154 | |
155 | -ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE))) | |
156 | - # Jars of system server, and apps loaded into system server should be | |
155 | +ifneq (,$(filter $(PRODUCT_SYSTEM_SERVER_JARS) $(PRODUCT_DEXPREOPT_SPEED_APPS) $(PRODUCT_SYSTEM_SERVER_APPS),$(LOCAL_MODULE))) | |
156 | + # Jars of system server, apps loaded into system server, and apps the product wants to be | |
157 | 157 | # compiled with the 'speed' compiler filter. |
158 | 158 | LOCAL_DEX_PREOPT_FLAGS += --compiler-filter=speed |
159 | 159 | else |
@@ -114,6 +114,7 @@ _product_var_list := \ | ||
114 | 114 | PRODUCT_SYSTEM_PROPERTY_BLACKLIST \ |
115 | 115 | PRODUCT_SYSTEM_SERVER_APPS \ |
116 | 116 | PRODUCT_SYSTEM_SERVER_JARS \ |
117 | + PRODUCT_DEXPREOPT_SPEED_APPS \ | |
117 | 118 | PRODUCT_VBOOT_SIGNING_KEY \ |
118 | 119 | PRODUCT_VBOOT_SIGNING_SUBKEY \ |
119 | 120 | PRODUCT_VERITY_SIGNING_KEY \ |
@@ -269,6 +269,7 @@ all_product_configs := | ||
269 | 269 | PRODUCT_BOOT_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BOOT_JARS)) |
270 | 270 | PRODUCT_SYSTEM_SERVER_JARS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_JARS)) |
271 | 271 | PRODUCT_SYSTEM_SERVER_APPS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SYSTEM_SERVER_APPS)) |
272 | +PRODUCT_DEXPREOPT_SPEED_APPS := $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEXPREOPT_SPEED_APPS)) | |
272 | 273 | |
273 | 274 | # Find the device that this product maps to. |
274 | 275 | TARGET_DEVICE := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEVICE) |
@@ -68,4 +68,7 @@ PRODUCT_SYSTEM_SERVER_APPS += \ | ||
68 | 68 | KeyChain \ |
69 | 69 | Telecom \ |
70 | 70 | |
71 | +# The set of packages we want to force 'speed' compilation on. | |
72 | +PRODUCT_DEXPREOPT_SPEED_APPS += \ | |
73 | + | |
71 | 74 | $(call inherit-product, $(SRC_TARGET_DIR)/product/core_base.mk) |
@@ -116,6 +116,9 @@ PRODUCT_SYSTEM_SERVER_APPS += \ | ||
116 | 116 | SettingsProvider \ |
117 | 117 | WallpaperBackup \ |
118 | 118 | |
119 | +# The set of packages we want to force 'speed' compilation on. | |
120 | +PRODUCT_DEXPREOPT_SPEED_APPS := \ | |
121 | + | |
119 | 122 | PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ |
120 | 123 | ro.zygote=zygote32 |
121 | 124 | PRODUCT_COPY_FILES += \ |