am 6463953e: am b796ce35: Merge "Remove HAVE_DLADDR from AndroidConfig.h."
# Via Android Git Automerger (1) and others
* commit '6463953e169bbd559cada7263be363202ed40d02':
Remove HAVE_DLADDR from AndroidConfig.h.
diff --git a/core/Makefile b/core/Makefile
index 2983a30..31a4021 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1019,7 +1019,9 @@
$(HOST_OUT_JAVA_LIBRARIES)/dumpkey.jar \
$(HOST_OUT_JAVA_LIBRARIES)/signapk.jar \
$(HOST_OUT_EXECUTABLES)/mkuserimg.sh \
- $(HOST_OUT_EXECUTABLES)/make_ext4fs
+ $(HOST_OUT_EXECUTABLES)/make_ext4fs \
+ $(HOST_OUT_EXECUTABLES)/simg2img \
+ $(HOST_OUT_EXECUTABLES)/e2fsck
OTATOOLS := $(DISTTOOLS) \
$(HOST_OUT_EXECUTABLES)/aapt
diff --git a/core/prebuilt.mk b/core/prebuilt.mk
index f59a17b..31ea0e0 100644
--- a/core/prebuilt.mk
+++ b/core/prebuilt.mk
@@ -59,10 +59,18 @@
built_module := $(LOCAL_BUILT_MODULE)
ifdef prebuilt_module_is_a_library
-# Create a dummy export_includes.
-$(intermediates)/export_includes:
+export_includes := $(intermediates)/export_includes
+$(export_includes): PRIVATE_EXPORT_C_INCLUDE_DIRS := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
+$(export_includes) : $(LOCAL_MODULE_MAKEFILE)
+ @echo Export includes file: $< -- $@
$(hide) mkdir -p $(dir $@) && rm -f $@
+ifdef LOCAL_EXPORT_C_INCLUDE_DIRS
+ $(hide) for d in $(PRIVATE_EXPORT_C_INCLUDE_DIRS); do \
+ echo "-I $$d" >> $@; \
+ done
+else
$(hide) touch $@
+endif
$(LOCAL_BUILT_MODULE) : | $(intermediates)/export_includes
endif
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index cd25dc5..247a6d3 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -1138,6 +1138,9 @@
background-color:inherit;
border:solid 1px #DDD;
}
+td *:last-child {
+ margin-bottom:0;
+}
th {
background-color: #999;
color: #fff;
diff --git a/tools/droiddoc/templates-sdk/assets/js/docs.js b/tools/droiddoc/templates-sdk/assets/js/docs.js
index d603269..43bcb8f 100644
--- a/tools/droiddoc/templates-sdk/assets/js/docs.js
+++ b/tools/droiddoc/templates-sdk/assets/js/docs.js
@@ -1144,6 +1144,7 @@
* Options:
* btnPrev: optional identifier for previous button
* btnNext: optional identifier for next button
+ * btnPause: optional identifier for pause button
* auto: whether or not to auto-proceed
* speed: animation speed
* autoTime: time between auto-rotation
@@ -1161,6 +1162,7 @@
o = $.extend({
btnPrev: null,
btnNext: null,
+ btnPause: null,
auto: true,
speed: 500,
autoTime: 12000,
@@ -1231,6 +1233,17 @@
e.preventDefault();
return go(curr+o.scroll);
});
+
+ //Pause button
+ if(o.btnPause)
+ $(o.btnPause).click(function(e) {
+ e.preventDefault();
+ if ($(this).hasClass('paused')) {
+ startRotateTimer();
+ } else {
+ pauseRotateTimer();
+ }
+ });
//Auto rotation
if(o.auto) startRotateTimer();
@@ -1244,6 +1257,12 @@
go(curr+o.scroll);
}
}, o.autoTime);
+ $(o.btnPause).removeClass('paused');
+ }
+
+ function pauseRotateTimer() {
+ clearInterval(timer);
+ $(o.btnPause).addClass('paused');
}
//Go to an item
diff --git a/tools/droiddoc/templates-sdk/head_tag.cs b/tools/droiddoc/templates-sdk/head_tag.cs
index 4bc5d0f..75e4cc6 100644
--- a/tools/droiddoc/templates-sdk/head_tag.cs
+++ b/tools/droiddoc/templates-sdk/head_tag.cs
@@ -33,4 +33,16 @@
<?cs else ?>
<script src="<?cs var:toroot ?>navtree_data.js" type="text/javascript"></script>
<?cs /if ?>
+
+<script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-5831155-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+</script>
</head>
\ No newline at end of file
diff --git a/tools/droiddoc/templates-sdk/trailer.cs b/tools/droiddoc/templates-sdk/trailer.cs
index 7aadcdd..1cf8793 100644
--- a/tools/droiddoc/templates-sdk/trailer.cs
+++ b/tools/droiddoc/templates-sdk/trailer.cs
@@ -29,7 +29,8 @@
<script type="text/javascript">
$('.slideshow-container').dacSlideshow({
btnPrev: '.slideshow-prev',
- btnNext: '.slideshow-next'
+ btnNext: '.slideshow-next',
+ btnPause: '#pauseButton'
});
</script>
<?cs /if ?>
@@ -43,12 +44,5 @@
<?cs /if ?>
<script type="text/javascript">
init(); /* initialize android-developer-docs.js */
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-
-<script type="text/javascript">
- var pageTracker = _gat._getTracker("UA-5831155-1");
- pageTracker._trackPageview();
</script>