commit 577c5ba9f4fd81e057d8c671772a16bc2719a9b3
author Fred Quintana <fredq@google.com> Thu Feb 18 16:00:46 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 18 16:00:46 2010 -0800
tree f6186f99dd44255133ef473a3173338ca2a34885
parent 1d89773c1dd0e433a2dbd0ef8aedaf4c20f6ff74
parent 5dc8a659174abf68df351049679b38e32a162c5c

Merge "remove obsolete property ro.config.sync"

core/node_fns.mk

diff --git a/core/node_fns.mk b/core/node_fns.mk
index 31b8543..38ecea7 100644
--- a/core/node_fns.mk
+++ b/core/node_fns.mk
@@ -162,8 +162,9 @@
           $(call uniq-word,$($(_eiv_tv)),$(INHERIT_TAG)$(i))) \
       $(eval ### "Expand the inherit tag") \
       $(eval $(_eiv_tv) := \
-          $(patsubst $(INHERIT_TAG)$(i),$($(1).$(i).$(v)), \
-              $($(_eiv_tv)))) \
+          $(strip \
+              $(patsubst $(INHERIT_TAG)$(i),$($(1).$(i).$(v)), \
+                  $($(_eiv_tv))))) \
       $(eval ### "Clear the child so DAGs don't create duplicate entries" ) \
       $(eval $(1).$(i).$(v) :=) \
       $(eval ### "If we just inherited ourselves, it's a cycle.") \

core/prelink-linux-arm.map

diff --git a/core/prelink-linux-arm.map b/core/prelink-linux-arm.map
index d3ba0fb..5ae1a78 100644
--- a/core/prelink-linux-arm.map
+++ b/core/prelink-linux-arm.map
@@ -146,7 +146,6 @@
 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 @@
 librpc.so               0x9A400000
 libtrace_test.so        0x9A300000
 libsrec_jni.so          0x9A200000
-libcerttool_jni.so      0x9A100000
 libjpeg.so              0x9A000000