commit 21528c5e053e28cd52d603eded53ffaf36d22637
author Tao Bao <tbao@google.com> Wed Apr 13 23:59:36 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 13 23:59:36 2016 +0000
tree 06ee894214f5e827661574f3057af06a529af6e3
parent 8e1fb06f383da53789e79255f8f083a9b8d721f6
parent d522bdc9edbf64d15a59c6924853b2e2c8c39e90

Merge "releasetools: Only verify the blocks to be touched." into nyc-dev

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 7ff0b0a..89166fa 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -39,9 +39,6 @@
     hid \
     ime \
     input \
-    input.evdev.default \
-    inputflinger \
-    inputflingerhost \
     javax.obex \
     libandroid \
     libandroid_runtime \
@@ -60,7 +57,6 @@
     libeffects \
     libinput \
     libinputflinger \
-    libinputflingerhost \
     libiprouteutil \
     libjnigraphics \
     libldnhncr \

tools/releasetools/rangelib.py

diff --git a/tools/releasetools/rangelib.py b/tools/releasetools/rangelib.py
index 975a48a..aa572cc 100644
--- a/tools/releasetools/rangelib.py
+++ b/tools/releasetools/rangelib.py
@@ -91,7 +91,7 @@
         if last <= s:
           last = s+1
         else:
-          monotonic = True
+          monotonic = False
     data.sort()
     self.data = tuple(self._remove_pairs(data))
     self.monotonic = monotonic

tools/releasetools/test_rangelib.py

diff --git a/tools/releasetools/test_rangelib.py b/tools/releasetools/test_rangelib.py
index 7debe66..a61a64e 100644
--- a/tools/releasetools/test_rangelib.py
+++ b/tools/releasetools/test_rangelib.py
@@ -117,6 +117,7 @@
     self.assertTrue(RangeSet("").monotonic)
     self.assertTrue(RangeSet("0-4 5-9").monotonic)
     self.assertFalse(RangeSet("5-9 0-4").monotonic)
+    self.assertFalse(RangeSet("258768-259211 196604").monotonic)
 
     self.assertTrue(RangeSet(data=[0, 10]).monotonic)
     self.assertTrue(RangeSet(data=[0, 10, 15, 20]).monotonic)