Automated rollback of commit 6a45a1770beff9153c1b67ac45e19998755a6eff.
*** Reason for rollback ***
Broke Bazel downstream
*** Original change description ***
Switch to using the d8 jar from maven.google.com instead of the jar from the
Android SDK.
RELNOTES: None
PiperOrigin-RevId: 303398232
diff --git a/WORKSPACE b/WORKSPACE
index 4208a66..cd0eb77 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,6 +1,6 @@
workspace(name = "io_bazel")
-load("//tools/build_defs/repo:http.bzl", "http_archive", "http_file", "http_jar")
+load("//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
# These can be used as values for the patch_cmds and patch_cmds_win attributes
# of http_archive, in order to export the WORKSPACE file from the BUILD or
@@ -154,8 +154,6 @@
"1.25.0.zip",
"rules_nodejs-1.3.0.tar.gz",
"android_tools_pkg-0.16.0.tar.gz",
- # for android_gmaven_r8
- "r8-1.6.84.jar",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
# bazelbuild/platforms
@@ -186,7 +184,6 @@
# rules_nodejs
"rules_nodejs-1.3.0.tar.gz": "b6670f9f43faa66e3009488bbd909bc7bc46a5a9661a33f6bc578068d1837f37",
"android_tools_pkg-0.16.0.tar.gz": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
- "r8-1.6.84.jar": "824d94de0210df3692a812e18ffa334a17365e059856ae03c772e9490d61d4d8",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
# bazelbuild/platforms
@@ -236,9 +233,6 @@
"android_tools_pkg-0.16.0.tar.gz": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
],
- "r8-1.6.84.jar": [
- "https://maven.google.com/com/android/tools/r8/1.6.84/r8-1.6.84.jar",
- ],
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
@@ -489,7 +483,6 @@
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz",
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip",
"android_tools_pkg-0.16.0.tar.gz",
- "r8-1.6.84.jar",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
# bazelbuild/platforms
@@ -514,7 +507,6 @@
"zulu11.37.17-ca-jdk11.0.6-macosx_x64.tar.gz": "e1fe56769f32e2aaac95e0a8f86b5a323da5af3a3b4bba73f3086391a6cc056f",
"zulu11.37.17-ca-jdk11.0.6-win_x64.zip": "a9695617b8374bfa171f166951214965b1d1d08f43218db9a2a780b71c665c18",
"android_tools_pkg-0.16.0.tar.gz": "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
- "r8-1.6.84.jar": "824d94de0210df3692a812e18ffa334a17365e059856ae03c772e9490d61d4d8",
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": "c00ceec469dbcf7929972e3c79f20c14033824538038a554952f5c31d8832f96",
# bazelbuild/platforms
@@ -540,9 +532,6 @@
"android_tools_pkg-0.16.0.tar.gz": [
"https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
],
- "r8-1.6.84.jar": [
- "https://maven.google.com/com/android/tools/r8/1.6.84/r8-1.6.84.jar",
- ],
# bazelbuild/bazel-skylib
"2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz": [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/2d4c9528e0f453b5950eeaeac11d8d09f5a504d4.tar.gz",
@@ -643,13 +632,6 @@
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
)
-# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
-http_jar(
- name = "android_gmaven_r8_for_testing",
- sha256 = "824d94de0210df3692a812e18ffa334a17365e059856ae03c772e9490d61d4d8",
- url = "https://maven.google.com/com/android/tools/r8/1.6.84/r8-1.6.84.jar",
-)
-
# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/coverage.WORKSPACE.
http_archive(
name = "remote_coverage_tools_for_testing",
diff --git a/src/BUILD b/src/BUILD
index 86c9421..1873fd1 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -727,7 +727,6 @@
filegroup(
name = "test_repos",
srcs = [
- "@android_gmaven_r8_for_testing//jar:file",
"@android_tools_for_testing//:WORKSPACE",
"@bazel_skylib//:WORKSPACE",
"@bazel_toolchains//:WORKSPACE",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
index d2c90f2..0a37d01 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE
@@ -1,4 +1,4 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_jar")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# This must be kept in sync with the top-level WORKSPACE file.
http_archive(
@@ -6,10 +6,3 @@
sha256 = "e2cbd43a9d23aa32197c29d689a7e017f205acb07053f5dd584f500a1a9d4361",
url = "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.16.0.tar.gz",
)
-
-# This must be kept in sync with the top-level WORKSPACE file.
-http_jar(
- name = "android_gmaven_r8",
- sha256 = "824d94de0210df3692a812e18ffa334a17365e059856ae03c772e9490d61d4d8",
- url = "https://maven.google.com/com/android/tools/r8/1.6.84/r8-1.6.84.jar",
-)
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 2d6d614..1f3b225 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -433,9 +433,6 @@
" pass",
"",
"def http_file(**kwargs):",
- " pass",
- "",
- "def http_jar(**kwargs):",
" pass");
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
index b394e53..b25d8a8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewTestCase.java
@@ -250,9 +250,6 @@
" pass",
"",
"def http_file(**kwargs):",
- " pass",
- "",
- "def http_jar(**kwargs):",
" pass");
initializeMockClient();
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index e441fb0..34059185 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -124,9 +124,6 @@
" pass",
"",
"def http_file(**kwargs):",
- " pass",
- "",
- "def http_jar(**kwargs):",
" pass");
analysisMock.setupMockClient(mockToolsConfig);
diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
index de16c0e..6bf3681 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/packages/BazelPackageLoaderTest.java
@@ -85,9 +85,6 @@
" pass",
"",
"def http_file(**kwargs):",
- " pass",
- "",
- "def http_jar(**kwargs):",
" pass");
FileSystemUtils.writeIsoLatin1(
tools.getRelative("tools/build_defs/repo/utils.bzl"),
diff --git a/src/test/shell/bazel/android/android_integration_test.sh b/src/test/shell/bazel/android/android_integration_test.sh
index 579570f..92764e0 100755
--- a/src/test/shell/bazel/android/android_integration_test.sh
+++ b/src/test/shell/bazel/android/android_integration_test.sh
@@ -80,67 +80,4 @@
assert_build //java/bazel/multidex:bin
}
-function write_hello_android_files() {
- mkdir -p java/com/example/hello
- mkdir -p java/com/example/hello/res/values
- cat > java/com/example/hello/res/values/strings.xml <<'EOF'
-<resources>
- <string name="app_name">HelloWorld</string>
- <string name="title_activity_main">Hello Main</string>
-</resources>
-EOF
-
- cat > java/com/example/hello/AndroidManifest.xml <<'EOF'
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.example.hello"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk
- android:minSdkVersion="7"
- android:targetSdkVersion="18" />
-
- <application android:label="@string/app_name">
- <activity
- android:name="com.example.hello.MainActivity"
- android:label="@string/title_activity_main" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
- </application>
-</manifest>
-EOF
-
- cat > java/com/example/hello/MainActivity.java <<'EOF'
-package com.example.hello;
-
-import android.app.Activity;
-
-public class MainActivity extends Activity {
-}
-EOF
-
-}
-
-function test_d8_compiles_hello_android() {
- write_hello_android_files
- setup_android_sdk_support
- cat > java/com/example/hello/BUILD <<'EOF'
-android_binary(
- name = 'hello',
- manifest = "AndroidManifest.xml",
- srcs = ['MainActivity.java'],
- resource_files = glob(["res/**"]),
-)
-EOF
-
- bazel clean
- bazel build --define=android_standalone_dexing_tool=d8_compat_dx \
- //java/com/example/hello:hello || fail "build failed"
-}
-
-
-
run_suite "Android integration tests"
diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh
index a0562f8..1a92fd7 100755
--- a/src/test/shell/testenv.sh
+++ b/src/test/shell/testenv.sh
@@ -287,7 +287,6 @@
repos=(
"android_tools_for_testing"
- "android_gmaven_r8_for_testing"
"bazel_skylib"
"bazel_toolchains"
"com_google_protobuf"
diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl
index 1a7ecda..b8d33d6 100644
--- a/tools/android/android_sdk_repository_template.bzl
+++ b/tools/android/android_sdk_repository_template.bzl
@@ -284,11 +284,11 @@
java_binary(
name = "d8_compat_dx",
main_class = "com.android.tools.r8.compatdx.CompatDx",
- runtime_deps = ["@android_gmaven_r8//jar"],
+ runtime_deps = [":d8_jar_import"],
)
- native.alias(
+ java_import(
name = "d8_jar_import",
- actual = "@android_gmaven_r8//jar",
+ jars = ["build-tools/%s/lib/d8.jar" % build_tools_directory],
)
TAGDIR_TO_TAG_MAP = {
