Merge change 9009 into donut
* changes:
Reapply modifications from 3175 to fix display of navTree in doc output.
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 103a738..42ad42a 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -61,10 +61,13 @@
CtsMediaTestCases \
CtsOsTestCases \
CtsPermissionTestCases \
+ CtsPermission2TestCases \
CtsProviderTestCases \
+ CtsTelephonyTestCases \
CtsTextTestCases \
CtsUtilTestCases \
CtsViewTestCases \
+ CtsWebkitTestCases \
CtsWidgetTestCases \
CtsNetTestCases \
SignatureTest \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index e9881bf..d847377 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -22,7 +22,6 @@
OpenWnn \
libWnnEngDic \
libWnnJpnDic \
- libWnnZHCNDic \
libwnndict \
ApiDemos \
GestureBuilder \
diff --git a/tools/findleaves.sh b/tools/findleaves.sh
index 7cc0fa7..6e3aed0 100755
--- a/tools/findleaves.sh
+++ b/tools/findleaves.sh
@@ -86,7 +86,7 @@
# Print out all files that match, as long as the path isn't explicitly
# pruned. This will print out extraneous results from directories whose
# parents have a match. These are filtered out by the awk script below.
-find "${@:0:$nargs}" $findargs -type f -name "$filename" -print |
+find "${@:1:$nargs-1}" $findargs -type f -name "$filename" -print |
# Only pass along the directory of each match.
sed -e 's/\/[^\/]*$/\//' |