Merge branch 'master' into froyo-release

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index d3ba0fb..5ae1a78 100644 (file)
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -146,7 +146,6 @@ libcam_ipl.so           0x9F000000
 libwbxml.so             0x9E800000
 libwbxml_jni.so         0x9E400000
 libxml2wbxml.so         0x9E000000
-libaes.so               0x9DC00000
 libdrm1.so              0x9D800000
 libdrm1_jni.so          0x9D400000
 libwapcore.so           0x9D000000
@@ -165,5 +164,4 @@ libUAPI_jni.so          0x9A500000
 librpc.so               0x9A400000
 libtrace_test.so        0x9A300000
 libsrec_jni.so          0x9A200000
-libcerttool_jni.so      0x9A100000
 libjpeg.so              0x9A000000

diff --git a/tools/java-event-log-tags.py b/tools/java-event-log-tags.py
index 552021e..c63fa20 100755 (executable)
--- a/tools/java-event-log-tags.py
+++ b/tools/java-event-log-tags.py
@@ -66,7 +66,14 @@ merged_tagfile = event_log_tags.TagFile(merged_fn)
 merged_by_name = dict([(t.tagname, t) for t in merged_tagfile.tags])
 for t in tagfile.tags:
   if t.tagnum is None:
-    t.tagnum = merged_by_name[t.tagname].tagnum
+    if t.tagname in merged_by_name:
+      t.tagnum = merged_by_name[t.tagname].tagnum
+    else:
+      # We're building something that's not being included in the
+      # product, so its tags don't appear in the merged file.  Assign
+      # them all an arbitrary number so we can emit the java and
+      # compile the (unused) package.
+      t.tagnum = 999999
 
 if "java_package" not in tagfile.options:
   tagfile.AddError("java_package option not specified", linenum=0)

diff --git a/tools/merge-event-log-tags.py b/tools/merge-event-log-tags.py
index c8f36fc..25ac697 100755 (executable)
--- a/tools/merge-event-log-tags.py
+++ b/tools/merge-event-log-tags.py
@@ -137,7 +137,7 @@ def hashname(str):
 for name, t in sorted(by_tagname.iteritems()):
   if t.tagnum is None:
     while True:
-      x = (hashname(name) % (ASSIGN_LIMIT - ASSIGN_START)) + ASSIGN_START
+      x = (hashname(name) % (ASSIGN_LIMIT - ASSIGN_START - 1)) + ASSIGN_START
       if x not in by_tagnum:
         t.tagnum = x
         by_tagnum[x] = t