From 27cd7f6bb4a02f56f9ad73e57e71e69a1c00d5ea Mon Sep 17 00:00:00 2001 From: Damien Martin-Guillerez Date: Wed, 5 Oct 2016 12:14:21 +0000 Subject: Rollback of commit af8ebca2b88a0ee1129b72b4ce825f6489c31e67. *** Reason for rollback *** Break `bazel fetch ...` Discovered by bisecting `bazel fetch tensorflow/...`, see attached bug for more information Fixes https://github.com/bazelbuild/bazel/issues/1880 *** Original change description *** Open source dex merging tools for incremental dexing. Tested with bazel build --incremental_dexing_binary_types=monodex,multidex_unsharded,multidex_sharded -- //examples/android/java/bazel:hello_world -- MOS_MIGRATED_REVID=135220785 --- .../devtools/build/android/dexer/DexConverter.java | 38 ---------------------- 1 file changed, 38 deletions(-) delete mode 100644 src/tools/android/java/com/google/devtools/build/android/dexer/DexConverter.java (limited to 'src/tools/android/java/com/google/devtools/build/android/dexer/DexConverter.java') diff --git a/src/tools/android/java/com/google/devtools/build/android/dexer/DexConverter.java b/src/tools/android/java/com/google/devtools/build/android/dexer/DexConverter.java deleted file mode 100644 index 924e636521..0000000000 --- a/src/tools/android/java/com/google/devtools/build/android/dexer/DexConverter.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2016 The Bazel Authors. 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. -package com.google.devtools.build.android.dexer; - -import com.android.dx.dex.file.DexFile; - -/** - * Converter from Java classes to corresponding standalone .dex files. - */ -class DexConverter { - - private final Dexing dexing; - - public DexConverter(Dexing dexing) { - this.dexing = dexing; - } - - public DexFile toDexFile(byte[] classfile, String classfilePath) { - DexFile result = dexing.newDexFile(); - dexing.addToDexFile(result, Dexing.parseClassFile(classfile, classfilePath)); - return result; - } - - public Dexing.DexingKey getDexingKey(byte[] classfile) { - return dexing.getDexingKey(classfile); - } -} -- cgit v1.2.3