diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:31:02 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-06-21 14:31:02 +0000 |
commit | d95682a63dbc9d143306445dc0df2af2aa65156b (patch) | |
tree | c17317e718ada6f5cc43e86d859522c5bcda6fd5 | |
parent | 28704bea251866d1438d60b59dcf090f446ffdc6 (diff) | |
parent | cf50f7f9bfae65aab4d924d17dec99be5a922999 (diff) | |
download | vogar-android12-mainline-adbd-release.tar.gz |
Snap for 7478028 from cf50f7f9bfae65aab4d924d17dec99be5a922999 to mainline-adbd-releaseandroid-mainline-12.0.0_r97android-mainline-12.0.0_r85android-mainline-12.0.0_r68android-mainline-12.0.0_r41android-mainline-12.0.0_r21android-mainline-12.0.0_r1android12-mainline-adbd-release
Change-Id: If70c9b6e74599f85112f9ee60fe20c637f3a9e75
-rw-r--r-- | Android.bp | 30 | ||||
-rw-r--r-- | Android.mk | 10 | ||||
-rw-r--r-- | METADATA | 1 | ||||
-rw-r--r-- | NOTICE | 201 | ||||
-rw-r--r-- | OWNERS | 6 | ||||
-rw-r--r-- | src/vogar/HostFileCache.java | 6 | ||||
-rw-r--r-- | src/vogar/ModeId.java | 15 | ||||
-rw-r--r-- | src/vogar/Run.java | 1 | ||||
-rw-r--r-- | src/vogar/Vogar.java | 5 | ||||
-rw-r--r-- | src/vogar/android/AndroidSdk.java | 34 | ||||
-rw-r--r-- | src/vogar/commands/Command.java | 4 |
11 files changed, 87 insertions, 226 deletions
@@ -15,6 +15,36 @@ // Build dependencies. // ============================================================ +package { + default_applicable_licenses: ["external_vogar_license"], +} + +// Added automatically by a large-scale-change that took the approach of +// 'apply every license found to every target'. While this makes sure we respect +// every license restriction, it may not be entirely correct. +// +// e.g. GPL in an MIT project might only apply to the contrib/ directory. +// +// Please consider splitting the single license below into multiple licenses, +// taking care not to lose any license_kind information, and overriding the +// default license using the 'licenses: [...]' property on targets as needed. +// +// For unused files, consider creating a 'fileGroup' with "//visibility:private" +// to attach the license to, and including a comment whether the files may be +// used in the current project. +// See: http://go/android-license-faq +license { + name: "external_vogar_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + ], + license_text: [ + "LICENSE", + ], +} + java_import_host { name: "vogar-jsr305", jars: ["lib/jsr305.jar"], @@ -20,6 +20,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := vogar +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_SRC_FILES := $(call all-java-files-under, src/) @@ -55,6 +58,9 @@ run-vogar-tests: vogar-tests include $(CLEAR_VARS) LOCAL_MODULE := vogar-tests +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE LOCAL_MODULE_TAGS := optional LOCAL_MODULE_CLASS := JAVA_LIBRARIES LOCAL_SRC_FILES := $(call all-java-files-under, test/) @@ -73,6 +79,8 @@ include $(CLEAR_VARS) LOCAL_IS_HOST_MODULE := true LOCAL_MODULE_CLASS := EXECUTABLES LOCAL_MODULE := vogar +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE LOCAL_SRC_FILES := bin/vogar-android include $(BUILD_PREBUILT) - @@ -13,5 +13,6 @@ third_party { value: "http://vogar.googlecode.com/svn/trunk" } version: "" + license_type: NOTICE last_upgrade_date { year: 2017 month: 11 day: 17 } } @@ -1,201 +0,0 @@ - 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 [yyyy] [name of copyright owner] - - 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. @@ -1,3 +1,5 @@ -nfuller@google.com -paulduffin@google.com android-libcore-team+review@google.com +dsrbecky@google.com +ngeoffray@google.com +paulduffin@google.com +rpl@google.com diff --git a/src/vogar/HostFileCache.java b/src/vogar/HostFileCache.java index a2282f3..9232902 100644 --- a/src/vogar/HostFileCache.java +++ b/src/vogar/HostFileCache.java @@ -17,6 +17,7 @@ package vogar; import java.io.File; +import java.lang.ProcessHandle; import java.util.List; import vogar.commands.Command; import vogar.commands.Mkdir; @@ -44,7 +45,8 @@ public class HostFileCache implements FileCache { private void mv(File source, File destination) { List<String> rawResult = new Command.Builder(log).args("mv", source, destination).execute(); // A successful move returns no results. - if (!rawResult.isEmpty()) { + // Note that other process might have moved the file to the destination at the same time. + if (!rawResult.isEmpty() && !destination.exists()) { throw new RuntimeException("Couldn't move " + source + " to " + destination + ": " + rawResult.get(0)); } @@ -60,7 +62,7 @@ public class HostFileCache implements FileCache { mkdir.mkdirs(CACHE_ROOT); // Copy it onto the same file system first, then atomically move it into place. // That way, if we fail, we don't leave anything dangerous lying around. - File temporary = new File(cachedFile + ".tmp"); + File temporary = new File(cachedFile + ".tmp" + String.valueOf(ProcessHandle.current().pid())); cp(source, temporary); mv(temporary, cachedFile); } diff --git a/src/vogar/ModeId.java b/src/vogar/ModeId.java index c1b3be6..613722a 100644 --- a/src/vogar/ModeId.java +++ b/src/vogar/ModeId.java @@ -23,8 +23,6 @@ import java.util.List; public enum ModeId { /** (Target) dalvikvm with "normal" jars */ DEVICE, - /** (Target) dalvikvm with -testdex jars */ - DEVICE_TESTDEX, /** (Host) dalvikvm with -hostdex jars */ HOST, /** (Host) java */ @@ -105,7 +103,7 @@ public enum ModeId { /** Returns {@code true} if execution takes place with a device-mode Android runtime */ public boolean isDevice() { - return this == ModeId.DEVICE || this == ModeId.DEVICE_TESTDEX || this == ModeId.APP_PROCESS; + return this == ModeId.DEVICE || this == ModeId.APP_PROCESS; } public boolean requiresAndroidSdk() { @@ -116,7 +114,7 @@ public enum ModeId { if (variant == Variant.DEFAULT) { return true; } else if (variant == Variant.X64 || variant == Variant.X32) { - return this == HOST || this == DEVICE || this == DEVICE_TESTDEX || this == APP_PROCESS; + return this == HOST || this == DEVICE || this == APP_PROCESS; } // Unknown variant. return false; @@ -125,7 +123,7 @@ public enum ModeId { /** Does this mode support chroot-based execution? */ public boolean supportsChroot() { // We only support execution from a chroot directory in device mode for now. - return this == ModeId.DEVICE || this == ModeId.DEVICE_TESTDEX; + return this == ModeId.DEVICE; } public boolean supportsToolchain(Toolchain toolchain) { @@ -140,7 +138,6 @@ public enum ModeId { } switch (this) { case DEVICE: - case DEVICE_TESTDEX: case HOST: if (variant == Variant.DEFAULT) { return "dalvikvm"; @@ -195,12 +192,6 @@ public enum ModeId { case DEVICE: jarNames.addAll(Arrays.asList(DEVICE_JARS)); break; - case DEVICE_TESTDEX: { - for (String deviceJarName : Arrays.asList(DEVICE_JARS)) { - jarNames.add(deviceJarName + "-testdex"); - } - break; - } case HOST: jarNames.addAll(Arrays.asList(HOST_JARS)); break; diff --git a/src/vogar/Run.java b/src/vogar/Run.java index 9a0abc7..4a61a76 100644 --- a/src/vogar/Run.java +++ b/src/vogar/Run.java @@ -193,7 +193,6 @@ public final class Run { case HOST: return new HostRuntime(this, modeId, variant); case DEVICE: - case DEVICE_TESTDEX: case APP_PROCESS: return new DeviceRuntime(this, modeId, variant, new Supplier<String>() { @Override diff --git a/src/vogar/Vogar.java b/src/vogar/Vogar.java index 04e3333..a7f3272 100644 --- a/src/vogar/Vogar.java +++ b/src/vogar/Vogar.java @@ -238,17 +238,16 @@ public final class Vogar { System.out.println(); System.out.println("GENERAL OPTIONS"); System.out.println(); - System.out.println(" --mode <ACTIVITY|APP_PROCESS|DEVICE|DEVICE_TESTDEX|HOST|JVM>: specify which environment to run in."); + System.out.println(" --mode <ACTIVITY|APP_PROCESS|DEVICE|HOST|JVM>: specify which environment to run in."); System.out.println(" ACTIVITY: runs in an Android application on a device or emulator"); System.out.println(" APP_PROCESS: runs in an app_process runtime on a device or emulator"); System.out.println(" DEVICE: runs in an ART runtime on a device or emulator"); - System.out.println(" DEVICE_TESTDEX: like DEVICE but compiles with -testdex bootclasspath jars"); System.out.println(" HOST: runs in an ART runtime on the local desktop built with any lunch combo."); System.out.println(" JVM: runs in a Java VM on the local desktop"); System.out.println(" Default is: " + modeId); System.out.println(); System.out.println(" --variant <DEFAULT|X32|X64>: specify which dalvikvm (or other) variant to execute with"); - System.out.println(" Used with --mode <HOST|DEVICE|DEVICE_TESTDEX> only, not applicable for all devices."); + System.out.println(" Used with --mode <HOST|DEVICE> only, not applicable for all devices."); System.out.println(" DEFAULT: default (or N/A), X32: 32-bit, X64: 64-bit"); System.out.println(" Default is: " + variant); System.out.println(); diff --git a/src/vogar/android/AndroidSdk.java b/src/vogar/android/AndroidSdk.java index 0ff6f28..45f11bb 100644 --- a/src/vogar/android/AndroidSdk.java +++ b/src/vogar/android/AndroidSdk.java @@ -175,7 +175,8 @@ public class AndroidSdk { desugarJarPath = desugarJar.getPath(); - String pattern = outDir + "target/common/obj/JAVA_LIBRARIES/%s_intermediates/classes"; + String pattern = outDir + + "target/common/obj/JAVA_LIBRARIES/%s_intermediates/classes"; if (modeId.isHost()) { pattern = outDir + "host/common/obj/JAVA_LIBRARIES/%s_intermediates/classes"; } @@ -185,7 +186,36 @@ public class AndroidSdk { compilationClasspath = new File[jarNames.length]; for (int i = 0; i < jarNames.length; i++) { String jar = jarNames[i]; - compilationClasspath[i] = new File(String.format(pattern, jar)); + File file; + if (modeId.isHost()) { + if ("conscrypt-hostdex".equals(jar)) { + jar = "conscrypt-host-hostdex"; + } else if ("core-icu4j-hostdex".equals(jar)) { + jar = "core-icu4j-host-hostdex"; + } + file = new File(String.format(pattern, jar)); + } else { + final String apexPackage; + // With unbundled ART, the intermediate directory storing the jar file + // outside ART APEX doesn't contain the apex package name. + final boolean tryNonApexIntermediate; + if ("conscrypt".equals(jar)) { + apexPackage = "com.android.conscrypt"; + tryNonApexIntermediate = true; + } else if ("core-icu4j".equals(jar)) { + apexPackage = "com.android.i18n"; + tryNonApexIntermediate = true; + } else { + apexPackage = "com.android.art.testing"; + tryNonApexIntermediate = false; + } + + file = new File(String.format(pattern, jar + "." + apexPackage)); + if (tryNonApexIntermediate && !file.exists()) { + file = new File(String.format(pattern, jar)); + } + } + compilationClasspath[i] = file; } } else { throw new RuntimeException("Couldn't derive Android home from " diff --git a/src/vogar/commands/Command.java b/src/vogar/commands/Command.java index dbd4daf..60c30b7 100644 --- a/src/vogar/commands/Command.java +++ b/src/vogar/commands/Command.java @@ -308,7 +308,7 @@ public final class Command { */ private abstract class TimeoutTask implements Runnable { public final void schedule() { - timer.schedule(this, System.nanoTime() - timeoutNanoTime, TimeUnit.NANOSECONDS); + timer.schedule(this, timeoutNanoTime - System.nanoTime(), TimeUnit.NANOSECONDS); } protected abstract void onTimeout(Process process); @@ -324,7 +324,7 @@ public final class Command { onTimeout(process); } else { // if the kill time has been pushed back, reschedule - timer.schedule(this, System.nanoTime() - timeoutNanoTime, TimeUnit.NANOSECONDS); + schedule(); } } } |