Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05199b6e authored by smain@google.com's avatar smain@google.com Committed by android-build-merger
Browse files

Merge "resolve merge conflicts of 78291319 to nyc-dev" into nyc-dev 

am: 388d5758

* commit '388d5758':
  Delete all of the tools/ directory, but save the adk files by moving them up. Redirects for all the tools/ files are already in Piper's site-android/en/_redirects.yaml file. The new adk redirects are in this cl: https://critique.corp.google.com/#review/121302608

Change-Id: I9ab3833eaaf22919312af1e90c51b787ed33d578
parents 6044f8df 388d5758

docs/html/tools/adk/adk.jd→docs/html/adk/adk.jd

+0 −0

File moved.

View file

docs/html/tools/adk/adk2.jd→docs/html/adk/adk2.jd

+0 −0

File moved.

View file

docs/html/tools/adk/index.jd→docs/html/adk/index.jd

+0 −0

File moved.

View file

docs/html/tools/_book.yaml

deleted100644 → 0
+0 −280
Original line number Original line Diff line number Diff line 
toc:

- title: Download

  path: /sdk/index.html

  section:

  - title: Install Android Studio

    path: /sdk/installing/index.html



- title: Workflow

  path: /tools/workflow/index.html

  section:

  - title: Projects

    path: /tools/projects/index.html

  - title: Build and Run

    path: /tools/building/index.html

  - title: Virtual Devices

    path: /tools/devices/index.html

  - title: Hardware Devices

    path: /tools/device.html

    section:

    - title: USB Drivers

      path: /tools/extras/oem-usb.html

  - title: Testing

    path: /tools/testing/index.html

  - title: Debugging

    path: /tools/debugging/index.html

  - title: Publishing

    path: /tools/publishing/publishing_overview.html

    path_attributes:

    - name: zh-cn-lang

      value: 发布概述

    section:

    - title: Preparing for Release

      path: /tools/publishing/preparing.html

      path_attributes:

      - name: zh-cn-lang

        value: 准备发布

    - title: Versioning Your Apps

      path: /tools/publishing/versioning.html

    - title: Signing Your Apps

      path: /tools/publishing/app-signing.html



- title: Android Studio

  path: /tools/studio/index.html

  section:

  - title: Features

    path: /tools/studio/studio-features.html

  - title: Configuration

    path: /tools/studio/studio-config.html

    section:

    - title: SDK Manager

      path: /tools/help/sdk-manager.html

  - title: Project Tools

    path: /sdk/installing/create-project.html

    section:

    - title: Project Structure Management

      path: /tools/help/project-mgmt.html

    - title: Using Code Templates

      path: /tools/projects/templates.html

    - title: Building and Running

      path: /tools/building/building-studio.html

  - title: Code Tools

    path: /tools/studio/code-tools.html

    section:

    - title: Improving Your Code with lint

      path: /tools/debugging/improving-w-lint.html

    - title: Improving Code Inspection with Annotations

      path: /tools/debugging/annotations.html

    - title: Shrink Your Code and Resources

      path: /tools/help/proguard.html

    - title: Supporting URLs and App Indexing in Android Studio

      path: /tools/help/app-link-indexing.html

  - title: UI Tools

    path: /tools/studio/ui-tools.html

    section:

    - title: Layout Editor

      path: /sdk/installing/studio-layout.html

    - title: Theme Editor

      path: /tools/help/theme-editor.html

    - title: Translations Editor

      path: /tools/help/translations-editor.html

    - title: Vector Asset Studio

      path: /tools/help/vector-asset-studio.html

    - title: Image Asset Studio

      path: /tools/help/image-asset-studio.html

  - title: AVD Manager

    path: /tools/devices/managing-avds.html

  - title: Android Emulator

    path: /tools/devices/emulator.html

    section:

    - title: Android Emulator Command-Line Features

      path: /tools/help/emulator.html

  - title: Debugging Tools

    path: /tools/debugging/debugging-studio.html

    section:

    - title: DDMS

      path: /tools/debugging/ddms.html

  - title: Android Monitor

    path: /tools/help/android-monitor.html

    section:

    - title: logcat Monitor

      path: /tools/help/am-logcat.html

    - title: Memory Monitor

      path: /tools/help/am-memory.html

    - title: CPU Monitor

      path: /tools/help/am-cpu.html

    - title: GPU Monitor

      path: /tools/help/am-gpu.html

    - title: Network Monitor

      path: /tools/help/am-network.html

  - title: Tips and Tricks

    path: /sdk/installing/studio-tips.html

  - title: Migrating from Eclipse ADT

    path: /sdk/installing/migrate.html

    section:

    - title: Transition Guide

      path: /tools/studio/eclipse-transition-guide.html



- title: Tools Help

  path: /tools/help/index.html

  section:

  - title: adb

    path: /tools/help/adb.html

  - title: android

    path: /tools/help/android.html

    section:

    - title: Managing AVDs

      path: /tools/devices/managing-avds-cmdline.html

    - title: Managing Projects

      path: /tools/projects/projects-cmdline.html

  - title: AVD Manager

    path: /tools/help/avd-manager.html

  - title: bmgr

    path: /tools/help/bmgr.html

  - title: Desktop Head Unit

    path: /tools/help/desktop-head-unit.html

  - title: Device Monitor

    path: /tools/help/monitor.html

  - title: dmtracedump

    path: /tools/help/dmtracedump.html

  - title: Draw 9-Patch

    path: /tools/help/draw9patch.html

  - title: etc1tool

    path: /tools/help/etc1tool.html

  - title: Hierarchy Viewer

    path: /tools/help/hierarchy-viewer.html

    section:

    - title: Optimizing your UI

      path: /tools/debugging/debugging-ui.html

  - title: hprof-conv

    path: /tools/help/hprof-conv.html

  - title: jobb

    path: /tools/help/jobb.html

  - title: lint

    path: /tools/help/lint.html

  - title: logcat

    path: /tools/help/logcat.html

    section:

    - title: Reading and Writing Logs

      path: /tools/debugging/debugging-log.html

  - title: mksdcard

    path: /tools/help/mksdcard.html

  - title: Tracer for OpenGL ES

    path: /tools/help/gltracer.html

  - title: zipalign

    path: /tools/help/zipalign.html



- title: Build System

  path: /sdk/installing/studio-build.html

  section:

  - title: Running Gradle Builds

    path: /tools/building/building-cmdline.html

  - title: Configuring Gradle Builds

    path: /tools/building/configuring-gradle.html

  - title: Android Plugin for Gradle

    path: /tools/building/plugin-for-gradle.html

  - title: Manifest Merging

    path: /tools/building/manifest-merge.html

  - title: Apps Over 64K Methods

    path: /tools/building/multidex.html



- title: Performance Tools

  path: /tools/performance/index.html

  section:

  - title: Overdraw Debugger

    path: /tools/performance/debug-gpu-overdraw/index.html

  - title: Rendering Profiler

    path: /tools/performance/profile-gpu-rendering/index.html

  - title: Hierarchy Viewer

    path: /tools/performance/hierarchy-viewer/index.html

    section:

    - title: Setup

      path: /tools/performance/hierarchy-viewer/setup.html

    - title: Profiling

      path: /tools/performance/hierarchy-viewer/profiling.html

  - title: Memory Profilers

    path: /tools/performance/comparison.html

    section:

    - title: Memory Monitor

      path: /tools/performance/memory-monitor/index.html

    - title: Heap Viewer

      path: /tools/performance/heap-viewer/index.html

    - title: Allocation Tracker

      path: /tools/performance/allocation-tracker/index.html

    - title: Investigating Your RAM Usage

      path: /tools/debugging/debugging-memory.html

  - title: Traceview

    path: /tools/debugging/debugging-tracing.html

    section:

    - title: Walkthrough

      path: /tools/performance/traceview/index.html

    - title: Command Reference

      path: /tools/help/traceview.html

  - title: Systrace

    path: /tools/debugging/systrace.html

    section:

    - title: Walkthrough

      path: /tools/performance/systrace/index.html

    - title: Command Reference

      path: /tools/help/systrace.html

  - title: Battery Profilers

    path: /tools/performance/batterystats-battery-historian/index.html

    section:

    - title: Historian Charts

      path: /tools/performance/batterystats-battery-historian/charts.html



- title: Testing Tools

  path: /tools/testing/testing-tools.html

  section:

  - title: Testing Concepts

    path: /tools/testing/testing_android.html

  - title: Testing Support Library

    path: /tools/testing-support-library/index.html

    section:

    - title: API Reference

      path: /reference/android/support/test/package-summary.html

  - title: Testing with Android Studio

    path: /training/testing/start/index.html

  - title: Testing from the Command-Line

    path: /tools/testing/testing_otheride.html

  - title: monkey

    path: /tools/help/monkey.html

  - title: monkeyrunner

    path: /tools/help/monkeyrunner_concepts.html

    section:

    - title: MonkeyDevice

      path: /tools/help/MonkeyDevice.html

    - title: MonkeyImage

      path: /tools/help/MonkeyImage.html

    - title: MonkeyRunner

      path: /tools/help/MonkeyRunner.html



- title: Support Library

  path: /tools/support-library/index.html

  section:

  - title: Features

    path: /tools/support-library/features.html

  - title: Setup

    path: /tools/support-library/setup.html



- title: Data Binding Library

  path: /tools/data-binding/guide.html



- title: Revisions

  path: /tools/revisions/index.html

  section:

  - title: Android Studio

    path: /tools/revisions/studio.html

  - title: SDK Tools

    path: /tools/sdk/tools-notes.html

  - title: SDK Build Tools

    path: /tools/revisions/build-tools.html

  - title: Android Plugin for Gradle

    path: /tools/revisions/gradle-plugin.html

  - title: SDK Platforms

    path: /tools/revisions/platforms.html

  - title: ADT Plugin

    path: /tools/sdk/eclipse-adt.html



- title: NDK

  path: /tools/sdk/ndk/index.html

docs/html/tools/building/building-cmdline.jd

deleted100644 → 0
+0 −364

File deleted.

Preview size limit exceeded, changes collapsed.