Skip to content

GitLab

T
tangled
Commit 12456ee9 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot
Browse files
Options

Revert "Android: Split out a "javac" wrapper from compile_java.py for GOMA" 

This reverts commit 3051c63a.

Reason for revert: No longer required by goma

Original change's description:
> Android: Split out a "javac" wrapper from compile_java.py for GOMA
> 
> Bug: 726475
> Change-Id: Ia9068d24655c3cff62faeaf6eec7815fec4fdba5
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1967792
> Reviewed-by: Peter Wen <wnwen@chromium.org>
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#735504}

TBR=wnwen@chromium.org,agrieve@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 726475
Change-Id: I768451be2e5e2609fd9d1623f72e3ec71eb106b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2061396
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742173}
parent 7a9ca38d
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 114 deletions
build/android/gyp/compile_java.py
View file @ 12456ee9
......@@ -23,9 +23,6 @@ sys.path.insert(
os.path.join(build_utils.DIR_SOURCE_ROOT, 'third_party', 'colorama', 'src'))
import colorama
_JAVAC_WRAPPER = os.path.join(build_utils.DIR_SOURCE_ROOT, 'build', 'android',
'gyp', 'javac')
# Full list of checks: https://errorprone.info/bugpatterns
ERRORPRONE_WARNINGS_TO_TURN_OFF = [
# This one should really be turned on.
......@@ -200,7 +197,6 @@ def ProcessJavacOutput(output):
def _ExtractClassFiles(jar_path, dest_dir, java_files):
"""Extracts all .class files not corresponding to |java_files|."""
# Two challenges exist here:
# 1. |java_files| have prefixes that are not represented in the the jar paths.
# 2. A single .java file results in multiple .class files when it contains
......@@ -270,7 +266,7 @@ class _InfoFileContext(object):
self._srcjar_files[path] = '{}/{}'.format(
srcjar_path, os.path.relpath(path, parent_dir))
def SubmitFiles(self, java_files, close=False):
def SubmitFiles(self, java_files):
if self._pool is None:
# Restrict to just one process to not slow down compiling. Compiling
# is always slower.
......@@ -278,9 +274,7 @@ class _InfoFileContext(object):
logging.info('Submitting %d files for info', len(java_files))
self._results.append(
self._pool.imap_unordered(
_ProcessJavaFileForInfo, java_files, chunksize=10))
if close:
self._pool.close()
_ProcessJavaFileForInfo, java_files, chunksize=1000))
def _CheckPathMatchesClassName(self, java_file, package_name, class_name):
parts = package_name.split('.') + [class_name + '.java']
......@@ -344,14 +338,21 @@ class _InfoFileContext(object):
logging.info('Completed info file: %s', output_path)
def _AddExtraJarFiles(jar_path, provider_configurations=None, file_tuples=None):
with zipfile.ZipFile(jar_path, 'a') as z:
for config in provider_configurations or []:
zip_path = 'META-INF/services/' + os.path.basename(config)
build_utils.AddToZipHermetic(z, zip_path, src_path=config)
def _CreateJarFile(jar_path, provider_configurations, additional_jar_files,
classes_dir):
logging.info('Start creating jar file: %s', jar_path)
with build_utils.AtomicOutput(jar_path) as f:
with zipfile.ZipFile(f.name, 'w') as z:
build_utils.ZipDir(z, classes_dir)
if provider_configurations:
for config in provider_configurations:
zip_path = 'META-INF/services/' + os.path.basename(config)
build_utils.AddToZipHermetic(z, zip_path, src_path=config)
for src_path, zip_path in file_tuples or []:
build_utils.AddToZipHermetic(z, zip_path, src_path=src_path)
if additional_jar_files:
for src_path, zip_path in additional_jar_files:
build_utils.AddToZipHermetic(z, zip_path, src_path=src_path)
logging.info('Completed jar file: %s', jar_path)
def _OnStaleMd5(options, javac_cmd, java_files, classpath):
......@@ -400,8 +401,7 @@ def _OnStaleMd5(options, javac_cmd, java_files, classpath):
if java_files:
# Don't include the output directory in the initial set of args since it
# being in a temp dir makes it unstable (breaks md5 stamping).
cmd = [_JAVAC_WRAPPER]
cmd += javac_cmd
cmd = list(javac_cmd)
cmd += ['-d', classes_dir]
cmd += ['-s', annotation_processor_outputs_dir]
......@@ -425,26 +425,13 @@ def _OnStaleMd5(options, javac_cmd, java_files, classpath):
logging.info('Finished build command')
if save_outputs:
annotation_processor_srcjar = os.path.join(
annotation_processor_outputs_dir, 'output.srcjar')
if os.path.exists(annotation_processor_srcjar):
annotation_processor_java_files = build_utils.ExtractAll(
annotation_processor_srcjar,
no_clobber=True,
path=annotation_processor_outputs_dir)
os.unlink(annotation_processor_srcjar)
if annotation_processor_java_files:
info_file_context.SubmitFiles(
annotation_processor_java_files, close=True)
with build_utils.AtomicOutput(options.jar_path) as f:
if java_files:
shutil.move(os.path.join(classes_dir, 'classes.jar'), f.name)
else:
zipfile.ZipFile(f.name, 'w').close()
if options.provider_configurations or options.additional_jar_files:
_AddExtraJarFiles(f.name, options.provider_configurations,
options.additional_jar_files)
annotation_processor_java_files = build_utils.FindInDirectory(
annotation_processor_outputs_dir)
if annotation_processor_java_files:
info_file_context.SubmitFiles(annotation_processor_java_files)
_CreateJarFile(options.jar_path, options.provider_configurations,
options.additional_jar_files, classes_dir)
info_file_context.Commit(options.jar_path + '.info')
else:
......
build/android/gyp/javac deleted 100755 → 0
View file @ 7a9ca38d
#!/usr/bin/env python
#
# Copyright 2019 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.
import logging
import os
import shutil
import subprocess
import sys
import zipfile
def _ClearDirectory(directory, skip=()):
for file in os.listdir(directory):
subpath = os.path.join(directory, file)
if subpath not in skip:
shutil.rmtree(subpath)
def _ListFiles(directory):
for root, _, filenames in os.walk(directory):
for f in filenames:
yield os.path.join(root, f)
def _ZipDir(root, jar_path, skip_empty=False):
subpaths = sorted(os.path.relpath(f, root) for f in _ListFiles(root))
if not subpaths and skip_empty:
return
with zipfile.ZipFile(jar_path, 'w') as z:
for subpath in subpaths:
with open(os.path.join(root, subpath)) as f:
data = f.read()
zipinfo = zipfile.ZipInfo(filename=subpath)
zipinfo.date_time = (2001, 1, 1, 0, 0, 0)
z.writestr(zipinfo, data, zipfile.ZIP_STORED)
def main():
logging.basicConfig(
level=logging.INFO if os.environ.get('JAVAC_DEBUG') else logging.WARNING,
format='%(levelname).1s %(relativeCreated)6d %(message)s')
javac_args = sys.argv[1:]
errorprone_enabled = '-Xplugin:ErrorProne' in javac_args
classes_dir = javac_args[javac_args.index('-d') + 1]
annotation_processor_outputs_dir = javac_args[javac_args.index('-s') + 1]
jar_path = os.path.join(classes_dir, 'classes.jar')
srcjar_path = os.path.join(annotation_processor_outputs_dir,
'output.srcjar')
if os.listdir(classes_dir):
raise Exception('classes_dir not empty.')
if os.listdir(annotation_processor_outputs_dir):
raise Exception('annotation_processor_outputs_dir not empty.')
ret = subprocess.call(javac_args)
if ret:
sys.exit(ret)
if errorprone_enabled:
# TODO(agrieve): Does goma require at least one output file?
open(jar_path, 'w').close()
else:
logging.info('Zipping classes')
_ZipDir(classes_dir, jar_path)
logging.info('Zipping sources')
_ZipDir(annotation_processor_outputs_dir, srcjar_path, skip_empty=True)
logging.info('Clearing directories')
_ClearDirectory(classes_dir, skip=(jar_path,))
_ClearDirectory(annotation_processor_outputs_dir, skip=(srcjar_path,))
main()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment