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