Skip to content

Commit

Permalink
[sdk] Manage Android SDK CIPD dependencies into DEPS
Browse files Browse the repository at this point in the history 
Manage Android SDK binary deps via CIPD logic. Move CIPD dependencies
in DEPS.

Adding cipd_*.yaml files for SDK packages, which are used to create and
upload the CIPD packages to service url.

Changing config.gni to point the android sdk root to
//third_party/android_sdk/public.

Split package /sources out to third_party/android_sdk/sources due to
different gclient condition.

Modify update_sdk.py to
1) Support changing pkg version in DEPS
2) Change --sdk-root default path for sources
3) Fix bugs


Bug: 659808
Change-Id: Ia9bafae24a15d8b1c917cf8c0953eb74b8daa0db
Reviewed-on: https://chromium-review.googlesource.com/807594
Reviewed-by: Grace Kloba <klobag@chromium.org>
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: Shenghua Zhang <shenghuazhang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550297}
  • Loading branch information
Shenghua Zhang authored and Commit Bot committed Apr 12, 2018
1 parent 8d42e25 commit cbe64ba
Show file tree
Hide file tree
Showing 13 changed files with 509 additions and 33 deletions.
74 changes: 74 additions & 0 deletions DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ vars = {
# purposes.
'checkout_configuration': 'default',

# By default, do not check out android sdk sources. This can be overridden
# e.g. with custom_vars.
'checkout_android_sdk_sources': False,

# Check out and download nacl by default. This can be disabled e.g. with
# custom_vars.
'checkout_nacl': True,
Expand Down Expand Up @@ -159,6 +163,34 @@ vars = {
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'feed_revision': '3a782b5dac6c8f2f927613d3f37b8cad72f934b2',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_build-tools_version
# and whatever else without interference from each other.
'android_sdk_build-tools_version': 'version:27.0.3-cr0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_emulator_version
# and whatever else without interference from each other.
'android_sdk_emulator_version': 'version:27.1.12-cr0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_extras_version
# and whatever else without interference from each other.
'android_sdk_extras_version': 'version:47.0.0-cr0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platform-tools_version
# and whatever else without interference from each other.
'android_sdk_platform-tools_version': 'version:27.0.1-cr0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_platforms_version
# and whatever else without interference from each other.
'android_sdk_platforms_version': 'version:android-27-cr0',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_sources_version
# and whatever else without interference from each other.
'android_sdk_sources_version': 'version:android-27-cr1',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling android_sdk_tools_version
# and whatever else without interference from each other.
'android_sdk_tools_version': 'version:26.1.1-cr0',
}

# Only these hosts are allowed for dependencies in this DEPS file.
Expand Down Expand Up @@ -332,6 +364,48 @@ deps = {
'condition': 'checkout_android',
},

'src/third_party/android_sdk/public': {
'packages': [
{
'package': 'chromium/third_party/android_sdk/public/build-tools',
'version': Var('android_sdk_build-tools_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/emulator',
'version': Var('android_sdk_emulator_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/extras',
'version': Var('android_sdk_extras_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/platform-tools',
'version': Var('android_sdk_platform-tools_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/platforms',
'version': Var('android_sdk_platforms_version'),
},
{
'package': 'chromium/third_party/android_sdk/public/tools',
'version': Var('android_sdk_tools_version'),
},
],
'condition': 'checkout_android',
'dep_type': 'cipd',
},

'src/third_party/android_sdk/sources': {
'packages': [
{
'package': 'chromium/third_party/android_sdk/sources',
'version': Var('android_sdk_sources_version'),
},
],
'condition': 'checkout_android_sdk_sources',
'dep_type': 'cipd',
},

'src/third_party/angle':
Var('chromium_git') + '/angle/angle.git' + '@' + Var('angle_revision'),

Expand Down
2 changes: 2 additions & 0 deletions third_party/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
/adobe/flash/symbols
/amd/
/android_ndk/
/android_sdk/public/
/android_sdk/sources/
/android_protobuf/src
/android_support_test_runner/lib/
/android_system_sdk/*.jar
Expand Down
217 changes: 217 additions & 0 deletions third_party/android_sdk/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,217 @@
Notice for all the files in this folder.
------------------------------------------------------------



Copyright (c) 2005-2008, The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License"); you may not
use this file except in compliance with the License.

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2011 Google Inc. All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
11 changes: 11 additions & 0 deletions third_party/android_sdk/OWNERS
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
agrieve@chromium.org
jbudorick@chromium.org
kerz@chromium.org
michaelbai@chromium.org
primiano@chromium.org
rmcilroy@chromium.org
sgurun@chromium.org
shenghuazhang@chromium.org
wangxianzhu@chromium.org
wnwen@chromium.org
yfriedman@chromium.org
24 changes: 24 additions & 0 deletions third_party/android_sdk/README.chromium
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Name: Android SDK
URL: http://developer.android.com/sdk/index.html
Version: 27
Android SDK Build-tools 27.0.3
Android SDK Emulator 27.1.12
Android SDK Extras 47.0.0
Android SDK Platform-tools 27.0.1
Android SDK Platform API 27
Android SDK Sources 27
Android SDK Tools 26.1.1
Security Critical: no
License: Apache Version 2.0

Description:
The Android SDK provide API libraries and developer tools necessary to
build, test and debug for Android.

Local Modifications:
-In public/
- Included previous version of tools/emma_device.jar, tools/emma.jar.
- Included the Android support library and required extras packages.
- Added extras/chromium/.

No other modifications has been made to the public Android SDK/NDK.
10 changes: 10 additions & 0 deletions third_party/android_sdk/cipd_build-tools.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# To create CIPD package run the following command.
# cipd create --pkg-def cipd_build-tools.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/build-tools
description: build-tools Android SDK Build Tools
data:
- dir: public/build-tools
10 changes: 10 additions & 0 deletions third_party/android_sdk/cipd_emulator.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# To create CIPD package run the following command.
# cipd create --pkg-def cipd_emulator.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/emulator
description: emulator Android SDK Emulator library
data:
- dir: public/emulator
10 changes: 10 additions & 0 deletions third_party/android_sdk/cipd_extras.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Copyright 2017 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

# To create CIPD package run the following command.
# cipd create --pkg-def cipd_extras.yaml -tag version:$version
package: chromium/third_party/android_sdk/public/extras
description: extras Android SDK Extras library
data:
- dir: public/extras
Loading

0 comments on commit cbe64ba

Please sign in to comment.