Skip to content

Commit

Permalink
Rollback of commit af8ebca.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Break `bazel fetch ...`

Discovered by bisecting `bazel fetch tensorflow/...`, see attached bug for more information

Fixes #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
  • Loading branch information
damienmg committed Oct 5, 2016
1 parent b54da5e commit 27cd7f6
Show file tree
Hide file tree
Showing 18 changed files with 4 additions and 1,591 deletions.
1 change: 0 additions & 1 deletion src/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ genrule(
"//src/tools/android/java/com/google/devtools/build/android/ideinfo:embedded_tools",
"//src/tools/android/java/com/google/devtools/build/android/idlclass:embedded_tools",
"//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:srcs",
"//src/tools/android/java/com/google/devtools/build/android/dexer:embedded_tools",
"//src/tools/android/java/com/google/devtools/build/android/ziputils:embedded_tools",
"//src/main/protobuf:srcs",
"//src/java_tools/buildjar:JavaBuilderDeploy",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ public Map<String, Label> apply(Rule rule) {
builder.put("android/palette_v7", Label.parseAbsoluteUnchecked(prefix + "palette_v7"));
builder.put(
"android/recyclerview_v7", Label.parseAbsoluteUnchecked(prefix + "recyclerview_v7"));
builder.put(
"android/dx_jar_import", Label.parseAbsoluteUnchecked(prefix + "dx_jar_import"));
return builder.build();
}
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ java_library(
filegroup(
name = "srcs",
srcs = glob(["**"]) + [
"//src/tools/android/java/com/google/devtools/build/android/dexer:srcs",
"//src/tools/android/java/com/google/devtools/build/android/ideinfo:srcs",
"//src/tools/android/java/com/google/devtools/build/android/idlclass:srcs",
"//src/tools/android/java/com/google/devtools/build/android/incrementaldeployment:srcs",
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 27cd7f6

Please sign in to comment.