forked from openkylin/platform_build
auto import from //branches/cupcake/...@131421
This commit is contained in:
The Android Open Source Project
parent
475fa12ade
commit
dca10d536d
|
|
@ -65,6 +65,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/mountd.conf)
|
|||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Browser_intermediates)
|
||||
$(call add-clean-step, rm -f vendor/google/apps/Talk/res/drawable/%*)
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/product/*/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_os_NetStat.o)
|
||||
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)
|
||||
|
||||
# ************************************************
|
||||
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||
|
|
|
|||
|
|
@ -17,11 +17,11 @@ cts_tools_src_dir := cts/tools
|
|||
|
||||
# Build a name that looks like:
|
||||
#
|
||||
# linux-x86 --> android-cts_12345_linux-x86
|
||||
# darwin-x86 --> android-cts_12345_mac-x86
|
||||
# windows-x86 --> android-cts_12345_windows
|
||||
# linux-x86 --> android-cts_linux-x86
|
||||
# darwin-x86 --> android-cts_mac-x86
|
||||
# windows-x86 --> android-cts_windows
|
||||
#
|
||||
cts_name := android-cts_$(FILE_NAME_TAG)
|
||||
cts_name := android-cts
|
||||
ifeq ($(HOST_OS),darwin)
|
||||
cts_host_os := mac
|
||||
else
|
||||
|
|
@ -74,8 +74,9 @@ $(cts_dir)/all_cts_files_stamp: $(CTS_CASE_LIST) | $(ACP)
|
|||
$(hide) chmod ug+rwX $(PRIVATE_DIR)/tools/$(notdir $(CTS_EXECUTABLE_PATH))
|
||||
$(foreach apk,$(CTS_CASE_LIST), \
|
||||
$(call copy-testcase-apk,$(apk)))
|
||||
# Copy CTS host config to CTS directory
|
||||
# Copy CTS host config and start script to CTS directory
|
||||
$(hide) $(ACP) -fp $(cts_tools_src_dir)/utils/host_config.xml $(PRIVATE_DIR)/repository/
|
||||
$(hide) $(ACP) -fp $(cts_tools_src_dir)/utils/startcts $(PRIVATE_DIR)/tools/
|
||||
$(hide) touch $@
|
||||
|
||||
# Generate the default test plan for User.
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
<div class="g-section g-tpl-240" id="body-content">
|
||||
<div class="g-unit g-first not-resizable" id="side-nav">
|
||||
<div id="devdoc-nav">
|
||||
<?cs include:"../../../java/android/html/sdk/sdk_toc.cs" ?>
|
||||
<?cs include:"../../../../frameworks/base/docs/html/sdk/sdk_toc.cs" ?>
|
||||
</div>
|
||||
</div> <!-- end side-nav -->
|
||||
<?cs /def ?>
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<div class="g-section g-tpl-240" id="body-content">
|
||||
<div class="g-unit g-first side-nav-resizable" id="side-nav">
|
||||
<div id="devdoc-nav">
|
||||
<?cs include:"../../../java/android/html/guide/guide_toc.cs" ?>
|
||||
<?cs include:"../../../../frameworks/base/docs/html/guide/guide_toc.cs" ?>
|
||||
</div>
|
||||
</div> <!-- end side-nav -->
|
||||
<script>
|
||||
|
|
@ -69,20 +69,9 @@
|
|||
</script>
|
||||
<?cs /def ?>
|
||||
|
||||
<?cs def:publish_nav() ?>
|
||||
<div class="g-section g-tpl-180" id="body-content">
|
||||
<div class="g-unit g-first" id="side-nav">
|
||||
<div id="devdoc-nav">
|
||||
<?cs include:"../../../java/android/html/publish/publish_toc.cs" ?>
|
||||
</div>
|
||||
</div> <!-- end side-nav -->
|
||||
<?cs /def ?>
|
||||
|
||||
<?cs def:custom_left_nav() ?>
|
||||
<?cs if:guide ?>
|
||||
<?cs call:guide_nav() ?>
|
||||
<?cs elif:publish ?>
|
||||
<?cs call:publish_nav() ?>
|
||||
<?cs elif:sdk ?>
|
||||
<?cs call:sdk_nav() ?>
|
||||
<?cs else ?>
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@
|
|||
|
||||
<div class="g-unit" id="doc-content" >
|
||||
|
||||
<div id="jd-content">
|
||||
|
||||
<?cs if:sdk.redirect ?>
|
||||
Redirecting to
|
||||
<a href="<?cs var:toroot ?>sdk/<?cs var:sdk.redirect ?>/index.html">
|
||||
|
|
@ -28,7 +26,14 @@
|
|||
</a>...
|
||||
<?cs else ?>
|
||||
|
||||
<h1><?cs var:page.title ?></h1>
|
||||
<div id="jd-header" class="guide-header" >
|
||||
<span class="crumb"> </span>
|
||||
<h1><?cs if:android.whichdoc == "online" ?>Download <?cs /if ?><?cs var:page.title ?></h1>
|
||||
</div>
|
||||
|
||||
|
||||
<div id="jd-content">
|
||||
|
||||
<p><em>
|
||||
<?cs var:sdk.date ?>
|
||||
</em></p>
|
||||
|
|
@ -41,6 +46,12 @@
|
|||
<?cs /if ?>
|
||||
|
||||
|
||||
<?cs if:android.whichdoc != "online" ?>
|
||||
|
||||
<p>The sections below provide an overview of the SDK package. </p>
|
||||
|
||||
<?cs else ?>
|
||||
|
||||
<p>Before downloading, please read the <a href="<?cs var:toroot ?>sdk/<?cs var:sdk.version ?>/requirements.html">
|
||||
System Requirements</a> document. As you start the download, you will also need to review and agree to
|
||||
the Terms and Conditions that govern the use of the Android SDK. </p>
|
||||
|
|
@ -77,11 +88,12 @@ the Terms and Conditions that govern the use of the Android SDK. </p>
|
|||
<td><?cs var:sdk.linux_checksum ?></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<?cs call:tag_list(root.descr) ?>
|
||||
|
||||
<?cs /if ?>
|
||||
|
||||
<?cs call:tag_list(root.descr) ?>
|
||||
|
||||
<?cs /if ?>
|
||||
</div><!-- end jd-content -->
|
||||
|
||||
<?cs include:"footer.cs" ?>
|
||||
|
|
|
|||
|
|
@ -169,6 +169,7 @@ hr.blue {
|
|||
margin:0;
|
||||
position:relative;
|
||||
width:100%;
|
||||
background: url('images/preliminary.png');
|
||||
}
|
||||
|
||||
#header {
|
||||
|
|
@ -293,6 +294,7 @@ hr.blue {
|
|||
margin: 20px 10px;
|
||||
color: #333;
|
||||
width:930px;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
#mainBodyFixed h3,
|
||||
|
|
@ -330,6 +332,7 @@ hr.blue {
|
|||
width: 600px;
|
||||
margin-right: 20px;
|
||||
color: #333;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
div.indent {
|
||||
|
|
@ -688,6 +691,7 @@ td.gsc-search-button {
|
|||
width: 584px;
|
||||
height: 580px;
|
||||
background:url(images/home/bg_home_middle.png) no-repeat 0 0;
|
||||
position:relative;
|
||||
}
|
||||
|
||||
#homeTitle {
|
||||
|
|
@ -718,18 +722,16 @@ td.gsc-search-button {
|
|||
.clearer { clear:both; }
|
||||
|
||||
#arrow-left, #arrow-right {
|
||||
display:block;
|
||||
float:left;
|
||||
width:42px;
|
||||
height:42px;
|
||||
background-image:url(images/home/carousel_buttons_sprite.png);
|
||||
background-repeat:no-repeat;
|
||||
}
|
||||
#arrow-left {
|
||||
float:left;
|
||||
margin:35px 3px 0 10px;
|
||||
}
|
||||
#arrow-right {
|
||||
float:left;
|
||||
margin:35px 10px 0 0;
|
||||
}
|
||||
.arrow-left-off,
|
||||
|
|
@ -752,18 +754,14 @@ td.gsc-search-button {
|
|||
.arrow-right-on {
|
||||
background-position:-42px 0;
|
||||
}
|
||||
|
||||
.arrow-right-off,
|
||||
.arrow-left-off {
|
||||
cursor:default;
|
||||
}
|
||||
|
||||
.app-list-container {
|
||||
clear:both;
|
||||
text-align: center;
|
||||
margin:37px 20px 0;
|
||||
_margin-top:33px;
|
||||
border:0px solid #ccc;
|
||||
position:relative;
|
||||
width:100%;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
#side-nav {
|
||||
padding:0 6px 0 0;
|
||||
background-color: #fff;
|
||||
font-size:12px;
|
||||
}
|
||||
|
||||
|
|
@ -73,6 +72,7 @@
|
|||
padding:0;
|
||||
line-height:16px;
|
||||
white-space:nowrap;
|
||||
zoom:1;
|
||||
}
|
||||
|
||||
#side-nav li h2 {
|
||||
|
|
@ -85,6 +85,7 @@
|
|||
#side-nav li a {
|
||||
text-decoration:none;
|
||||
padding: 0 0 0 18px;
|
||||
zoom:1;
|
||||
}
|
||||
|
||||
#side-nav li a:hover {
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
Loading…
Reference in New Issue