1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
|
Description: Remove Android rules
Temporary fix for unavailability of Android packages in Debian Testing
Author: Yun Peng <pcloudy@google.com>
Origin: upstream, https://github.com/meteorcloudy/bazel/commit/8f75c5db8a7b7070496584c08541c7f9ab36f67d
Forwarded: not-needed
Last-Update: 2020-11-05
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -38,7 +38,7 @@
EXCLUDE_FILES="src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/testing/* src/main/java/com/google/devtools/build/lib/collect/nestedset/NestedSetCodecTestUtils.java"
# Exclude whole directories under the bazel src tree that bazel itself
# doesn't depend on.
-EXCLUDE_DIRS="src/main/java/com/google/devtools/build/skydoc src/main/java/com/google/devtools/build/docgen tools/java/runfiles/testing src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils src/main/java/com/google/devtools/common/options/testing"
+EXCLUDE_DIRS="src/main/java/com/google/devtools/build/lib/rules/android src/main/java/com/google/devtools/build/lib/bazel/rules/android src/main/java/com/google/devtools/build/skydoc src/main/java/com/google/devtools/build/docgen tools/java/runfiles/testing src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils src/main/java/com/google/devtools/common/options/testing"
for d in $EXCLUDE_DIRS ; do
for f in $(find $d -type f) ; do
EXCLUDE_FILES+=" $f"
--- a/src/main/java/com/google/devtools/build/lib/bazel/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BUILD
@@ -30,7 +30,6 @@
"//src/main/java/com/google/devtools/build/lib/bazel/repository/cache",
"//src/main/java/com/google/devtools/build/lib/bazel/repository/downloader",
"//src/main/java/com/google/devtools/build/lib/bazel/repository/starlark",
- "//src/main/java/com/google/devtools/build/lib/bazel/rules/android",
"//src/main/java/com/google/devtools/build/lib/cmdline",
"//src/main/java/com/google/devtools/build/lib/events",
"//src/main/java/com/google/devtools/build/lib/pkgcache",
@@ -133,7 +132,6 @@
"//src/main/java/com/google/devtools/build/lib/profiler/callcounts:callcounts_module",
"//src/main/java/com/google/devtools/build/lib/profiler/memory:allocationtracker_module",
"//src/main/java/com/google/devtools/build/lib/remote",
- "//src/main/java/com/google/devtools/build/lib/runtime/mobileinstall",
"//src/main/java/com/google/devtools/build/lib/sandbox",
"//src/main/java/com/google/devtools/build/lib/ssd",
"//src/main/java/com/google/devtools/build/lib/standalone",
--- a/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/Bazel.java
@@ -45,7 +45,6 @@
com.google.devtools.build.lib.runtime.CommandLogModule.class,
com.google.devtools.build.lib.platform.SleepPreventionModule.class,
com.google.devtools.build.lib.runtime.BazelFileSystemModule.class,
- com.google.devtools.build.lib.runtime.mobileinstall.MobileInstallModule.class,
com.google.devtools.build.lib.bazel.BazelWorkspaceStatusModule.class,
com.google.devtools.build.lib.bazel.BazelDiffAwarenessModule.class,
com.google.devtools.build.lib.remote.RemoteModule.class,
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
@@ -39,10 +39,6 @@
import com.google.devtools.build.lib.bazel.repository.downloader.UrlRewriterParseException;
import com.google.devtools.build.lib.bazel.repository.starlark.StarlarkRepositoryFunction;
import com.google.devtools.build.lib.bazel.repository.starlark.StarlarkRepositoryModule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryFunction;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryRule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryFunction;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.events.Event;
import com.google.devtools.build.lib.pkgcache.PackageOptions;
@@ -155,8 +151,6 @@
return ImmutableMap.<String, RepositoryFunction>builder()
.put(LocalRepositoryRule.NAME, new LocalRepositoryFunction())
.put(NewLocalRepositoryRule.NAME, new NewLocalRepositoryFunction())
- .put(AndroidSdkRepositoryRule.NAME, new AndroidSdkRepositoryFunction())
- .put(AndroidNdkRepositoryRule.NAME, new AndroidNdkRepositoryFunction())
.put(LocalConfigPlatformRule.NAME, new LocalConfigPlatformFunction())
.build();
}
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BUILD
@@ -39,7 +39,6 @@
"//src/main/java/com/google/devtools/build/lib/analysis:config/fragment_provider",
"//src/main/java/com/google/devtools/build/lib/analysis:constraints/environment_rule",
"//src/main/java/com/google/devtools/build/lib/bazel/repository",
- "//src/main/java/com/google/devtools/build/lib/bazel/rules/android",
"//src/main/java/com/google/devtools/build/lib/bazel/rules/common",
"//src/main/java/com/google/devtools/build/lib/bazel/rules/cpp",
"//src/main/java/com/google/devtools/build/lib/bazel/rules/cpp:bazel_cpp_semantics",
@@ -67,7 +66,6 @@
"//src/main/java/com/google/devtools/build/lib/rules:repository/new_local_repository_rule",
"//src/main/java/com/google/devtools/build/lib/rules:test_rules",
"//src/main/java/com/google/devtools/build/lib/rules:toolchain_type",
- "//src/main/java/com/google/devtools/build/lib/rules/android",
"//src/main/java/com/google/devtools/build/lib/rules/config",
"//src/main/java/com/google/devtools/build/lib/rules/cpp",
"//src/main/java/com/google/devtools/build/lib/rules/cpp/proto:CcProtoLibrary",
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java
@@ -33,20 +33,6 @@
import com.google.devtools.build.lib.analysis.config.FragmentOptions;
import com.google.devtools.build.lib.analysis.config.RequiresOptions;
import com.google.devtools.build.lib.bazel.repository.LocalConfigPlatformRule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidNdkRepositoryRule;
-import com.google.devtools.build.lib.bazel.rules.android.AndroidSdkRepositoryRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAarImportRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidBinaryRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidDevice;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidDeviceScriptFixture;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidHostServiceFixture;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidInstrumentationTestRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidLibraryRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidLocalTestRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidSdkRule;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidSemantics;
-import com.google.devtools.build.lib.bazel.rules.android.BazelAndroidToolsDefaultsJar;
-import com.google.devtools.build.lib.bazel.rules.android.BazelSdkToolchainRule;
import com.google.devtools.build.lib.bazel.rules.cpp.BazelCppSemantics;
import com.google.devtools.build.lib.bazel.rules.cpp.proto.BazelCcProtoAspect;
import com.google.devtools.build.lib.bazel.rules.java.proto.BazelJavaLiteProtoAspect;
@@ -60,41 +46,6 @@
import com.google.devtools.build.lib.bazel.rules.python.BazelPythonConfiguration;
import com.google.devtools.build.lib.cmdline.LabelConstants;
import com.google.devtools.build.lib.packages.RuleClass.Builder.ThirdPartyLicenseExistencePolicy;
-import com.google.devtools.build.lib.rules.android.AarImportBaseRule;
-import com.google.devtools.build.lib.rules.android.AndroidApplicationResourceInfo;
-import com.google.devtools.build.lib.rules.android.AndroidAssetsInfo;
-import com.google.devtools.build.lib.rules.android.AndroidBinaryDataInfo;
-import com.google.devtools.build.lib.rules.android.AndroidCcLinkParamsProvider;
-import com.google.devtools.build.lib.rules.android.AndroidConfiguration;
-import com.google.devtools.build.lib.rules.android.AndroidDeviceBrokerInfo;
-import com.google.devtools.build.lib.rules.android.AndroidDeviceRule;
-import com.google.devtools.build.lib.rules.android.AndroidDeviceScriptFixtureRule;
-import com.google.devtools.build.lib.rules.android.AndroidFeatureFlagSetProvider;
-import com.google.devtools.build.lib.rules.android.AndroidHostServiceFixtureRule;
-import com.google.devtools.build.lib.rules.android.AndroidIdeInfoProvider;
-import com.google.devtools.build.lib.rules.android.AndroidIdlProvider;
-import com.google.devtools.build.lib.rules.android.AndroidInstrumentationInfo;
-import com.google.devtools.build.lib.rules.android.AndroidInstrumentationTestBaseRule;
-import com.google.devtools.build.lib.rules.android.AndroidLibraryAarInfo;
-import com.google.devtools.build.lib.rules.android.AndroidLibraryBaseRule;
-import com.google.devtools.build.lib.rules.android.AndroidLibraryResourceClassJarProvider;
-import com.google.devtools.build.lib.rules.android.AndroidLocalTestBaseRule;
-import com.google.devtools.build.lib.rules.android.AndroidLocalTestConfiguration;
-import com.google.devtools.build.lib.rules.android.AndroidManifestInfo;
-import com.google.devtools.build.lib.rules.android.AndroidNativeLibsInfo;
-import com.google.devtools.build.lib.rules.android.AndroidNeverlinkAspect;
-import com.google.devtools.build.lib.rules.android.AndroidPreDexJarProvider;
-import com.google.devtools.build.lib.rules.android.AndroidProguardInfo;
-import com.google.devtools.build.lib.rules.android.AndroidResourcesInfo;
-import com.google.devtools.build.lib.rules.android.AndroidRuleClasses;
-import com.google.devtools.build.lib.rules.android.AndroidRuleClasses.AndroidToolsDefaultsJarRule;
-import com.google.devtools.build.lib.rules.android.AndroidSdkBaseRule;
-import com.google.devtools.build.lib.rules.android.AndroidSdkProvider;
-import com.google.devtools.build.lib.rules.android.AndroidStarlarkCommon;
-import com.google.devtools.build.lib.rules.android.ApkInfo;
-import com.google.devtools.build.lib.rules.android.DexArchiveAspect;
-import com.google.devtools.build.lib.rules.android.ProguardMappingProvider;
-import com.google.devtools.build.lib.rules.android.databinding.DataBindingV2Provider;
import com.google.devtools.build.lib.rules.config.ConfigRules;
import com.google.devtools.build.lib.rules.core.CoreRules;
import com.google.devtools.build.lib.rules.cpp.proto.CcProtoAspect;
@@ -114,7 +65,6 @@
import com.google.devtools.build.lib.rules.repository.CoreWorkspaceRules;
import com.google.devtools.build.lib.rules.repository.NewLocalRepositoryRule;
import com.google.devtools.build.lib.rules.test.TestingSupportRules;
-import com.google.devtools.build.lib.starlarkbuildapi.android.AndroidBootstrap;
import com.google.devtools.build.lib.starlarkbuildapi.proto.ProtoBootstrap;
import com.google.devtools.build.lib.starlarkbuildapi.python.PyBootstrap;
import com.google.devtools.build.lib.starlarkbuildapi.stubs.ProviderStub;
@@ -327,89 +277,6 @@
}
};
- public static final RuleSet ANDROID_RULES =
- new RuleSet() {
- @Override
- public void init(ConfiguredRuleClassProvider.Builder builder) {
- String toolsRepository = checkNotNull(builder.getToolsRepository());
-
- builder.addConfigurationFragment(AndroidConfiguration.class);
- builder.addConfigurationFragment(AndroidLocalTestConfiguration.class);
-
- AndroidNeverlinkAspect androidNeverlinkAspect = new AndroidNeverlinkAspect();
- DexArchiveAspect dexArchiveAspect = new DexArchiveAspect(toolsRepository);
- builder.addNativeAspectClass(androidNeverlinkAspect);
- builder.addNativeAspectClass(dexArchiveAspect);
-
- builder.addRuleDefinition(new AndroidSdkBaseRule());
- builder.addRuleDefinition(new BazelAndroidSdkRule());
- builder.addRuleDefinition(
- new AndroidToolsDefaultsJarRule(BazelAndroidToolsDefaultsJar.class));
- builder.addRuleDefinition(new AndroidRuleClasses.AndroidBaseRule());
- builder.addRuleDefinition(new AndroidRuleClasses.AndroidResourceSupportRule());
- builder.addRuleDefinition(
- new AndroidRuleClasses.AndroidBinaryBaseRule(
- androidNeverlinkAspect, dexArchiveAspect));
- builder.addRuleDefinition(new BazelSdkToolchainRule());
- builder.addRuleDefinition(new AndroidLibraryBaseRule(androidNeverlinkAspect));
- builder.addRuleDefinition(new BazelAndroidLibraryRule());
- builder.addRuleDefinition(new BazelAndroidBinaryRule());
- builder.addRuleDefinition(new AarImportBaseRule());
- builder.addRuleDefinition(new BazelAarImportRule());
- builder.addRuleDefinition(new AndroidDeviceRule(BazelAndroidDevice.class));
- builder.addRuleDefinition(new AndroidLocalTestBaseRule());
- builder.addRuleDefinition(new BazelAndroidLocalTestRule());
- builder.addRuleDefinition(new AndroidInstrumentationTestBaseRule());
- builder.addRuleDefinition(new BazelAndroidInstrumentationTestRule());
- builder.addRuleDefinition(
- new AndroidDeviceScriptFixtureRule(BazelAndroidDeviceScriptFixture.class));
- builder.addRuleDefinition(
- new AndroidHostServiceFixtureRule(BazelAndroidHostServiceFixture.class));
-
- AndroidBootstrap bootstrap =
- new AndroidBootstrap(
- new AndroidStarlarkCommon(),
- ApkInfo.PROVIDER,
- AndroidInstrumentationInfo.PROVIDER,
- AndroidDeviceBrokerInfo.PROVIDER,
- AndroidResourcesInfo.PROVIDER,
- AndroidNativeLibsInfo.PROVIDER,
- AndroidApplicationResourceInfo.PROVIDER,
- AndroidSdkProvider.PROVIDER,
- AndroidManifestInfo.PROVIDER,
- AndroidAssetsInfo.PROVIDER,
- AndroidLibraryAarInfo.PROVIDER,
- AndroidProguardInfo.PROVIDER,
- AndroidIdlProvider.PROVIDER,
- AndroidIdeInfoProvider.PROVIDER,
- AndroidPreDexJarProvider.PROVIDER,
- AndroidCcLinkParamsProvider.PROVIDER,
- DataBindingV2Provider.PROVIDER,
- AndroidLibraryResourceClassJarProvider.PROVIDER,
- AndroidFeatureFlagSetProvider.PROVIDER,
- ProguardMappingProvider.PROVIDER,
- AndroidBinaryDataInfo.PROVIDER);
- builder.addStarlarkBootstrap(bootstrap);
-
- try {
- builder.addWorkspaceFilePrefix(
- ResourceFileLoader.loadResource(BazelAndroidSemantics.class, "android.WORKSPACE"));
- builder.addWorkspaceFileSuffix(
- ResourceFileLoader.loadResource(
- BazelAndroidSemantics.class, "android_remote_tools.WORKSPACE"));
- builder.addWorkspaceFileSuffix(
- ResourceFileLoader.loadResource(JavaRules.class, "coverage.WORKSPACE"));
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- }
-
- @Override
- public ImmutableList<RuleSet> requires() {
- return ImmutableList.of(CoreRules.INSTANCE, CcRules.INSTANCE, JavaRules.INSTANCE);
- }
- };
-
public static final RuleSet PYTHON_RULES =
new RuleSet() {
@Override
@@ -451,8 +318,6 @@
public void init(ConfiguredRuleClassProvider.Builder builder) {
// TODO(ulfjack): Split this up by conceptual units.
builder.addRuleDefinition(new NewLocalRepositoryRule());
- builder.addRuleDefinition(new AndroidSdkRepositoryRule());
- builder.addRuleDefinition(new AndroidNdkRepositoryRule());
builder.addRuleDefinition(new LocalConfigPlatformRule());
try {
@@ -484,7 +349,6 @@
CPP_PROTO_RULES,
JavaRules.INSTANCE,
JAVA_PROTO_RULES,
- ANDROID_RULES,
PYTHON_RULES,
ObjcRules.INSTANCE,
J2ObjcRules.INSTANCE,
|
