auto import from //branches/cupcake_rel/...@138607
diff --git a/core/build_id.mk b/core/build_id.mk
old mode 100644
new mode 100755
index cb18bc4..03af5f5
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,32 +1,3 @@
-#
-# Copyright (C) 2008 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Defines branch-specific values.
-#
-
-# BUILD_ID is usually used to specify the branch name
-# (like "MAIN") or a branch name and a release candidate
-# (like "TC1-RC5"). It must be a single word, and is
-# capitalized by convention.
-#
-BUILD_ID := CUPCAKE
-
-# DISPLAY_BUILD_NUMBER should only be set for development branches,
-# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
-# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
-# is the same as BUILD_ID
-DISPLAY_BUILD_NUMBER := true
+# This branch was born out of a naming conventions fix.
+# The decision was to keep the RC names the same.
+export BUILD_ID=CRA71C
diff --git a/core/main.mk b/core/main.mk
index a19beba..37c580d 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -201,13 +201,26 @@
ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes
endif
-ifeq "" "$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES))"
- # Install an apns-conf.xml file if one's not already being installed.
- PRODUCT_COPY_FILES += development/data/etc/apns-conf_sdk.xml:system/etc/apns-conf.xml
- ifeq ($(filter sdk,$(MAKECMDGOALS)),)
+# Install an apns-conf.xml file if one's not already being installed.
+ifeq (,$(filter %:system/etc/apns-conf.xml, $(PRODUCT_COPY_FILES)))
+ PRODUCT_COPY_FILES += \
+ development/data/etc/apns-conf_sdk.xml:system/etc/apns-conf.xml
+ ifeq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
$(warning implicitly installing apns-conf_sdk.xml)
endif
endif
+# If we're on an eng or tests build, but not on the sdk, and we have
+# a better one, use that instead.
+ifneq ($(filter eng tests,$(TARGET_BUILD_VARIANT)),)
+ ifeq ($(filter sdk,$(MAKECMDGOALS)),)
+ apns_to_use := $(wildcard vendor/google/etc/apns-conf.xml)
+ ifneq ($(strip $(apns_to_use)),)
+ PRODUCT_COPY_FILES := \
+ $(filter-out %:system/etc/apns-conf.xml,$(PRODUCT_COPY_FILES)) \
+ $(strip $(apns_to_use)):system/etc/apns-conf.xml
+ endif
+ endif
+endif
ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
diff --git a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp b/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp
index fde2d08..102cf0e 100644
--- a/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp
+++ b/tools/dexpreopt/dexopt-wrapper/DexOptWrapper.cpp
@@ -115,7 +115,7 @@
exit(67); /* usually */
} else {
/* parent -- wait for child to finish */
- printf("waiting for verify+opt, pid=%d\n", (int) pid);
+ printf("--- waiting for verify+opt, pid=%d\n", (int) pid);
int status, oldStatus;
pid_t gotPid;
diff --git a/tools/dexpreopt/dexpreopt.py b/tools/dexpreopt/dexpreopt.py
index 8a80e06..5dde642 100755
--- a/tools/dexpreopt/dexpreopt.py
+++ b/tools/dexpreopt/dexpreopt.py
@@ -95,9 +95,9 @@
or unqualified (and left to exec() to find).
kernel: If set, passed to the emulator as "-kernel".
ramdisk: If set, passed to the emulator as "-ramdisk".
- image: If set, passed to the emulator as "-image".
+ image: If set, passed to the emulator as "-system".
userdata: If set, passed to the emulator as "-initdata" and "-data".
- system: If set, passed to the emulator as "-system".
+ system: If set, passed to the emulator as "-sysdir".
Returns:
A subprocess.Popen that refers to the emulator process, or None if
@@ -107,9 +107,10 @@
args = [exe_name]
if kernel: args += ['-kernel', kernel]
if ramdisk: args += ['-ramdisk', ramdisk]
- if image: args += ['-image', image]
+ if image: args += ['-system', image]
if userdata: args += ['-initdata', userdata, '-data', userdata]
- if system: args += ['-system', system]
+ if system: args += ['-sysdir', system]
+ args += ['-partition-size', '128']
args += ['-no-window', '-netfast', '-noaudio']
_USE_PIPE = True