Merge change 7583
* changes:
Modify libqcamera to be called liboemcamera
diff --git a/cleanspec.mk b/cleanspec.mk
index 0c57dd2..803b1b6 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -62,6 +62,7 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libwebcore_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.google.android.datamessaging_intermediates)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/sholes/obj/SHARED_LIBRARIES/libhardware_legacy_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/pvasflocal.cfg)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
diff --git a/core/combo/arch/arm/armv7-a.mk b/core/combo/arch/arm/armv7-a.mk
index 51e1d0f..ca30932 100644
--- a/core/combo/arch/arm/armv7-a.mk
+++ b/core/combo/arch/arm/armv7-a.mk
@@ -7,6 +7,8 @@
ARCH_ARM_HAVE_HALFWORD_MULTIPLY := true
ARCH_ARM_HAVE_CLZ := true
ARCH_ARM_HAVE_FFS := true
+ARCH_ARM_HAVE_VFP := true
+ARCH_ARM_HAVE_NEON := true
# Note: Hard coding the 'tune' value here is probably not ideal,
# and a better solution should be found in the future.
diff --git a/envsetup.sh b/envsetup.sh
index d797b7c..4ef6d77 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -596,6 +596,8 @@
# Find the closest Android.mk file.
T=$(gettop)
local M=$(findmakefile)
+ # Remove the path to top as the makefilepath needs to be relative
+ local M=`echo $M|sed 's:'$T'/::'`
if [ ! "$T" ]; then
echo "Couldn't locate the top of the tree. Try setting TOP."
elif [ ! "$M" ]; then
diff --git a/tools/signapk/SignApk.java b/tools/signapk/SignApk.java
index fb55028..caf7935 100644
--- a/tools/signapk/SignApk.java
+++ b/tools/signapk/SignApk.java
@@ -304,9 +304,14 @@
pkcs7.encodeSignedData(out);
}
- /** Copy all the files in a manifest from input to output. */
+ /**
+ * Copy all the files in a manifest from input to output. We set
+ * the modification times in the output to a fixed time, so as to
+ * reduce variation in the output file and make incremental OTAs
+ * more efficient.
+ */
private static void copyFiles(Manifest manifest,
- JarFile in, JarOutputStream out) throws IOException {
+ JarFile in, JarOutputStream out, long timestamp) throws IOException {
byte[] buffer = new byte[4096];
int num;
@@ -315,15 +320,16 @@
Collections.sort(names);
for (String name : names) {
JarEntry inEntry = in.getJarEntry(name);
+ JarEntry outEntry = null;
if (inEntry.getMethod() == JarEntry.STORED) {
// Preserve the STORED method of the input entry.
- out.putNextEntry(new JarEntry(inEntry));
+ outEntry = new JarEntry(inEntry);
} else {
// Create a new entry so that the compressed len is recomputed.
- JarEntry je = new JarEntry(name);
- je.setTime(inEntry.getTime());
- out.putNextEntry(je);
+ outEntry = new JarEntry(name);
}
+ outEntry.setTime(timestamp);
+ out.putNextEntry(outEntry);
InputStream data = in.getInputStream(inEntry);
while ((num = data.read(buffer)) > 0) {
@@ -380,7 +386,7 @@
writeSignatureBlock(signature, publicKey, outputJar);
// Everything else
- copyFiles(manifest, inputJar, outputJar);
+ copyFiles(manifest, inputJar, outputJar, timestamp);
} catch (Exception e) {
e.printStackTrace();
System.exit(1);