Snap for 8426163 from 18889250966b69e0eb516cfa95e4cf352b09cf12 to mainline-tzdata2-release
Change-Id: Id26617342970884ae5d4f30424277bf7b0602862
diff --git a/METADATA b/METADATA
deleted file mode 100644
index d97975c..0000000
--- a/METADATA
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party {
- license_type: NOTICE
-}
diff --git a/README.md b/README.md
deleted file mode 100644
index 114360d..0000000
--- a/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Android PGO Profiles
-====================
-
-For the latest version of this doc, please make sure to visit:
-[Android PGO Profiles](https://android.googlesource.com/toolchain/pgo-profiles/+/master/README.md)
-
-
-Getting the necessary dependencies
-----------------------------------
-
-First, you need to install `python-pip`, as well as 2 packages from it.
-
-```
-$ sudo apt-get install python-pip
-$ sudo pip install --upgrade google-api-python-client
-$ sudo pip install --upgrade oauth2client
-```
-
-Updating PGO Profiles
----------------------
-
-We only update profiles in the Android release branch, so this script should
-be run directly from that location. The following is a sample command line for
-updating the PGO profiles:
-
-```
-$ python toolchain/pgo-profiles/scripts/update_profiles.py -b <BUG_NUMBER> --add-do-not-merge <BUILD_ID> ALL --profdata-suffix <YYYY-MM-DD>
-$ repo upload --cbr toolchain/pgo-profiles/
-# Each separate profile will be uploaded as a single patch, so that it can get appropriate reviews.
-```
-
-Note that you need to change that command to supply 3 pieces of information:
-- `BUG_NUMBER`: The buganizer bug number that should be part of the commit
- message. For Android R, that bug number is 150254950.
-- `BUILD_ID`: The build id from which to extract the PGO profiles. You should
- check [go/ab](http://go/ab) for the given release branch.
-- `YYYY-MM-DD`: The date of the build that the profiles come from (to keep it
- easier to check for stale profiles).
-
-
-More Information
-----------------
-
-PGO-related questions should be sent to the Android LLVM team's public list:
-[android-llvm@googlegroups.com](https://groups.google.com/forum/#!forum/android-llvm)
-
diff --git a/art/OWNERS b/art/OWNERS
index 4025796..7297a14 100644
--- a/art/OWNERS
+++ b/art/OWNERS
@@ -1,3 +1,3 @@
-calin@google.com
ngeoffray@google.com
+sehr@google.com
*
diff --git a/art/dex2oat_arm_arm64.profdata.2020-06-02 b/art/dex2oat_arm_arm64.profdata.2020-06-02
new file mode 100644
index 0000000..9d8b581
--- /dev/null
+++ b/art/dex2oat_arm_arm64.profdata.2020-06-02
Binary files differ
diff --git a/art/dex2oat_arm_arm64.profdata.2021-07-15 b/art/dex2oat_arm_arm64.profdata.2021-07-15
deleted file mode 100644
index 1476fe1..0000000
--- a/art/dex2oat_arm_arm64.profdata.2021-07-15
+++ /dev/null
Binary files differ
diff --git a/hwbinder/hwbinder.profdata.2020-06-02 b/hwbinder/hwbinder.profdata.2020-06-02
new file mode 100644
index 0000000..387c359
--- /dev/null
+++ b/hwbinder/hwbinder.profdata.2020-06-02
Binary files differ
diff --git a/hwbinder/hwbinder.profdata.2021-07-15 b/hwbinder/hwbinder.profdata.2021-07-15
deleted file mode 100644
index 9495812..0000000
--- a/hwbinder/hwbinder.profdata.2021-07-15
+++ /dev/null
Binary files differ
diff --git a/hwui/hwui.profdata.2020-06-02 b/hwui/hwui.profdata.2020-06-02
new file mode 100644
index 0000000..782359b
--- /dev/null
+++ b/hwui/hwui.profdata.2020-06-02
Binary files differ
diff --git a/hwui/hwui.profdata.2021-07-15 b/hwui/hwui.profdata.2021-07-15
deleted file mode 100644
index e48ddbe..0000000
--- a/hwui/hwui.profdata.2021-07-15
+++ /dev/null
Binary files differ
diff --git a/scripts/android_build_client.py b/scripts/android_build_client.py
index 7cee477..443011e 100644
--- a/scripts/android_build_client.py
+++ b/scripts/android_build_client.py
@@ -1,78 +1,24 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2019 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.
-# 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.
-#
-
-try:
- import apiclient.discovery
- import apiclient.http
- from oauth2client import client as oauth2_client
-except ImportError:
- missingImportString = """
- Missing necessary libraries. Try doing the following:
- $ sudo apt-get install python3-pip
- $ pip install --user --upgrade google-api-python-client
- $ pip install --user --upgrade oauth2client
-"""
- raise ImportError(missingImportString)
-
+import apiclient.discovery
+import apiclient.http
+from oauth2client import client as oauth2_client
import io
-import getpass
import os
-import utils
-
ANDROID_BUILD_API_SCOPE = (
'https://www.googleapis.com/auth/androidbuild.internal')
ANDROID_BUILD_API_NAME = 'androidbuildinternal'
ANDROID_BUILD_API_VERSION = 'v2beta1'
+TRADEFED_KEY_FILE = '/google/data/ro/teams/tradefed/configs/tradefed.json'
CHUNK_SIZE = 10 * 1024 * 1024 # 10M
-ANDROID_PGO_BUILD = 'pgo-coral-config1'
-
-STUBBY_COMMAND_PATH = '/google/data/ro/teams/android-llvm/tests/sso_stubby_cmd.sh'
-STUBBY_REQUEST = """
-target: {{
- scope: GAIA_USER
- name: "{user}@google.com"
-}}
-target_credential: {{
- type: OAUTH2_TOKEN
- oauth2_attributes: {{
- scope: '{scope}'
- }}
-}}
-"""
-
-
-def _get_oauth2_token():
- request = STUBBY_REQUEST.format(
- user=getpass.getuser(), scope=ANDROID_BUILD_API_SCOPE)
- with open(STUBBY_COMMAND_PATH) as stubby_command_file:
- stubby_command = stubby_command_file.read().strip().split()
- output = utils.check_output(stubby_command, input=request)
- # output is of the format:
- # oauth2_token: "<TOKEN>"
- return output.split('"')[1]
+ANDROID_PGO_BUILD = 'pgo-taimen-config1'
class AndroidBuildClient(object):
def __init__(self):
- creds = oauth2_client.AccessTokenCredentials(
- access_token=_get_oauth2_token(), user_agent='unused/1.0')
+ creds = oauth2_client.GoogleCredentials.from_stream(TRADEFED_KEY_FILE)
+ self.creds = creds.create_scoped([ANDROID_BUILD_API_SCOPE])
self.client = apiclient.discovery.build(
ANDROID_BUILD_API_NAME,
diff --git a/scripts/update_profiles.py b/scripts/update_profiles.py
old mode 100755
new mode 100644
index 375e96d..1413af1
--- a/scripts/update_profiles.py
+++ b/scripts/update_profiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
#
# Copyright (C) 2019 The Android Open Source Project
#
@@ -172,7 +172,6 @@
def main():
args = parse_args()
- utils.check_gcertstatus()
if args.benchmark == 'ALL':
worklist = KNOWN_BENCHMARKS[1:]
diff --git a/scripts/utils.py b/scripts/utils.py
index 035c1b8..5f39c06 100644
--- a/scripts/utils.py
+++ b/scripts/utils.py
@@ -42,30 +42,19 @@
subprocess.check_call(cmd, *args, **kwargs)
-def check_output(cmd, *args, **kwargs):
- """subprocess.check_output with logging."""
- logger().info('check_output: %s', subprocess.list2cmdline(cmd))
- return subprocess.run(
- cmd, *args, **kwargs, check=True, text=True,
- stdout=subprocess.PIPE).stdout
-
-
def android_build_top():
return os.path.realpath(os.path.join(THIS_DIR, '../../..'))
def clang_build():
- gofilename = os.path.join(android_build_top(), 'build', 'soong', 'cc',
- 'config', 'global.go')
+ gofile = os.path.join(android_build_top(), 'build', 'soong', 'cc', 'config', 'global.go')
try:
- with open(gofilename) as gofile:
- lines = gofile.readlines()
+ lines = file(gofile).readlines()
versionLine = [l for l in lines if 'ClangDefaultVersion' in l][0]
start, end = versionLine.index('"'), versionLine.rindex('"')
- return versionLine[start + 1:end]
+ return versionLine[start + 1: end]
except Exception as err:
- raise RuntimeError(
- 'Extracting Clang version failed with {0}'.format(err))
+ raise RuntimeError("Extracting Clang version failed with {0}".format(err))
def llvm_profdata():
@@ -75,12 +64,3 @@
def run_llvm_profdata(inputs, output):
check_call([llvm_profdata(), 'merge', '-output=' + output] + inputs)
-
-
-def check_gcertstatus():
- """Ensure gcert valid for > 1 hour."""
- try:
- check_call(['gcertstatus', '-quiet', '-check_remaining=1h'])
- except subprocess.CalledProcessError:
- print('Run prodaccess before executing this script.')
- raise