merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/core/build_id.mk b/core/build_id.mk
index 928651d..40bb35d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,4 +1,3 @@
-
#
# Copyright (C) 2008 The Android Open Source Project
#
@@ -14,9 +13,20 @@
# 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 "CRB01"). It must be a single word, and is
+# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
+#
+BUILD_ID := MASTER
-export BUILD_ID=JWQ63
+# 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
diff --git a/target/product/emulator.mk b/target/product/emulator.mk
index 582ca64..146a00a 100644
--- a/target/product/emulator.mk
+++ b/target/product/emulator.mk
@@ -34,3 +34,6 @@
lib64GLES_CM_translator \
lib64GLES_V2_translator \
lib64EGL_translator
+
+PRODUCT_COPY_FILES += \
+ device/generic/goldfish/fstab.goldfish:root/fstab.goldfish
diff --git a/target/product/full.mk b/target/product/full.mk
index 8231e99..a4075d4 100644
--- a/target/product/full.mk
+++ b/target/product/full.mk
@@ -22,6 +22,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic/device.mk)
+include $(SRC_TARGET_DIR)/product/emulator.mk
+
# Overrides
PRODUCT_NAME := full
PRODUCT_DEVICE := generic
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index c28fd1b..b2e3189 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -40,8 +40,6 @@
VisualizationWallpapers \
PhotoTable
-include $(SRC_TARGET_DIR)/product/emulator.mk
-
# Additional settings used in all AOSP builds
PRODUCT_PROPERTY_OVERRIDES := \
ro.com.android.dateformat=MM-dd-yyyy \
diff --git a/target/product/full_mips.mk b/target/product/full_mips.mk
index 2debfec..9418ba2 100644
--- a/target/product/full_mips.mk
+++ b/target/product/full_mips.mk
@@ -22,6 +22,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_mips/device.mk)
+include $(SRC_TARGET_DIR)/product/emulator.mk
+
# Overrides
PRODUCT_NAME := full_mips
PRODUCT_DEVICE := generic_mips
diff --git a/target/product/full_x86.mk b/target/product/full_x86.mk
index 9941384..6e229a5 100644
--- a/target/product/full_x86.mk
+++ b/target/product/full_x86.mk
@@ -26,6 +26,8 @@
$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_x86/device.mk)
+include $(SRC_TARGET_DIR)/product/emulator.mk
+
ifdef NET_ETH0_STARTONBOOT
PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1
endif
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 3226423..1918c33 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -68,8 +68,6 @@
rild \
LegacyCamera
-include $(SRC_TARGET_DIR)/product/emulator.mk
-
# Define the host tools and libs that are parts of the SDK.
-include sdk/build/product_sdk.mk
-include development/build/product_sdk.mk
@@ -83,7 +81,6 @@
PRODUCT_PACKAGE_OVERLAYS := development/sdk_overlay
PRODUCT_COPY_FILES := \
- device/generic/goldfish/fstab.goldfish:root/fstab.goldfish \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \
system/core/rootdir/etc/vold.fstab:system/etc/vold.fstab \
frameworks/base/data/sounds/effects/camera_click.ogg:system/media/audio/ui/camera_click.ogg \
@@ -96,6 +93,8 @@
frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf
+include $(SRC_TARGET_DIR)/product/emulator.mk
+
$(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
$(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
$(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
