merge in honeycomb-release history after reset to honeycomb
diff --git a/core/base_rules.mk b/core/base_rules.mk
index d0af289..d0c4aaf 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -520,7 +520,7 @@
ifneq ($(LOCAL_ACP_UNAVAILABLE),true)
$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE) | $(ACP)
@echo "Install: $@"
- $(copy-file-to-target)
+ $(copy-file-to-new-target)
else
$(LOCAL_INSTALLED_MODULE): $(LOCAL_BUILT_MODULE)
@echo "Install: $@"
@@ -534,7 +534,7 @@
@echo "Install: $@"
$(copy-file-to-target)
-$(LOCAL_INSTALLED_MODULE) : | $(installed_odex)
+$(LOCAL_INSTALLED_MODULE) : $(installed_odex)
endif
endif # !LOCAL_UNINSTALLABLE_MODULE
diff --git a/core/build_id.mk b/core/build_id.mk
index 8df44c5..40bb35d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -13,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=HRI19B
+# 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/core/definitions.mk b/core/definitions.mk
index 6ba7485..ea47f6b 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1634,9 +1634,12 @@
# Copy a single file from one place to another,
# preserving permissions and overwriting any existing
# file.
+# We disable the "-t" option for acp can not handle
+# high resolution timestamp correctly on file systems like ext4.
+# Therefore copy-file-to-target is the same as copy-file-to-new-target.
define copy-file-to-target
@mkdir -p $(dir $@)
-$(hide) $(ACP) -fpt $< $@
+$(hide) $(ACP) -fp $< $@
endef
# The same as copy-file-to-target, but use the local
@@ -1725,7 +1728,7 @@
# Command to copy the file with acp, if proguard is disabled.
define proguard-disabled-commands
@echo Copying: $@
-$(hide) $(ACP) $< $@
+$(hide) $(ACP) -fp $< $@
endef
# Command to call Proguard
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 6e0b093..4da2632 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -51,7 +51,7 @@
@echo "Dexpreopt Boot Jar: $$@"
$(hide) rm -f $$@
$(hide) mkdir -p $$(dir $$@)
- $(hide) $(ACP) -fpt $$< $$(PRIVATE_DBJ_JAR)
+ $(hide) $(ACP) -fp $$< $$(PRIVATE_DBJ_JAR)
$$(call dexpreopt-one-file,$$(PRIVATE_DBJ_JAR),$$@)
$(_dbj_jar_no_dex) : $(_dbj_src_jar) | $(ACP) $(AAPT)
@@ -60,6 +60,7 @@
$(eval _dbj_jar :=)
$(eval _dbj_odex :=)
+$(eval _dbj_jar_no_dex :=)
$(eval _dbj_src_jar :=)
endef
diff --git a/core/java.mk b/core/java.mk
index c4baff5..949af3c 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -136,8 +136,10 @@
renderscript_intermediate := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript
# prepend the RenderScript system include path
-LOCAL_RENDERSCRIPT_INCLUDES := $(TOPDIR)frameworks/base/libs/rs/scriptc \
- $(LOCAL_RENDERSCRIPT_INCLUDES)
+LOCAL_RENDERSCRIPT_INCLUDES := \
+ $(TOPDIR)external/clang/lib/Headers \
+ $(TOPDIR)frameworks/base/libs/rs/scriptc \
+ $(LOCAL_RENDERSCRIPT_INCLUDES)
$(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)
$(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)
@@ -235,7 +237,7 @@
else
$(full_classes_jarjar_jar): $(full_classes_compiled_jar) | $(ACP)
@echo Copying: $@
- $(hide) $(ACP) $< $@
+ $(hide) $(ACP) -fp $< $@
endif
ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
@@ -273,7 +275,7 @@
# Keep a copy of the jar just before proguard processing.
$(full_classes_jar): $(full_classes_emma_jar) | $(ACP)
@echo Copying: $@
- $(hide) $(ACP) $< $@
+ $(hide) $(ACP) -fp $< $@
# Run proguard if necessary, otherwise just copy the file.
proguard_dictionary := $(intermediates.COMMON)/proguard_dictionary
@@ -335,7 +337,7 @@
$(transform-classes.jar-to-dex)
$(built_dex): $(built_dex_intermediate) | $(ACP)
@echo Copying: $@
- $(hide) $(ACP) $< $@
+ $(hide) $(ACP) -fp $< $@
ifneq ($(GENERATE_DEX_DEBUG),)
$(install-dex-debug)
endif
diff --git a/target/product/core.mk b/target/product/core.mk
index 72010c9..06b7003 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -74,10 +74,7 @@
DefaultContainerService \
Bugreport \
ip \
- screencap \
- libvideoeditor_jni \
- libvideoeditorplayer \
- libvideoeditor_core
+ screencap
# host-only dependencies
ifeq ($(WITH_HOST_DALVIK),true)
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index 4b1e394..db74a7f 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -49,7 +49,11 @@
icu.dat
PRODUCT_PACKAGES += \
- librs_jni
+ librs_jni \
+ libvideoeditor_jni \
+ libvideoeditorplayer \
+ libvideoeditor_core
+
PRODUCT_COPY_FILES := \
system/bluetooth/data/audio.conf:system/etc/bluetooth/audio.conf \
diff --git a/tools/releasetools/edify_generator.py b/tools/releasetools/edify_generator.py
index a1eea1f..4ed1a07 100644
--- a/tools/releasetools/edify_generator.py
+++ b/tools/releasetools/edify_generator.py
@@ -168,17 +168,21 @@
"""Format the given partition, specified by its mount point (eg,
"/system")."""
+ reserve_size = 0
fstab = self.info.get("fstab", None)
if fstab:
p = fstab[partition]
- self.script.append('format("%s", "%s", "%s");' %
- (p.fs_type, common.PARTITION_TYPES[p.fs_type], p.device))
+ # Reserve the last 16 Kbytes of an EMMC /data for the crypto footer
+ if partition == "/data" and common.PARTITION_TYPES[p.fs_type] == "EMMC":
+ reserve_size = -16384
+ self.script.append('format("%s", "%s", "%s", "%s");' %
+ (p.fs_type, common.PARTITION_TYPES[p.fs_type], p.device, reserve_size))
else:
# older target-files without per-partition types
partition = self.info.get("partition_path", "") + partition
- self.script.append('format("%s", "%s", "%s");' %
+ self.script.append('format("%s", "%s", "%s", "%s");' %
(self.info["fs_type"], self.info["partition_type"],
- partition))
+ partition, reserve_size))
def DeleteFiles(self, file_list):
"""Delete all files in file_list."""
