Skip to content

Commit

Permalink
Remove obsolete code for config splits
Browse files Browse the repository at this point in the history
Bazel support was never launched, and aapt1 is already obsolete.

Most of the deleted logic (SplitConfigurationFilter) deals with inferring a
split's configuration from its filename, but the right way is to read this
directly from its manifest:
* https://android.googlesource.com/platform/frameworks/base/+/refs/tags/platform-tools-29.0.2/tools/aapt2/cmd/Util.cpp#219

PiperOrigin-RevId: 263009083
  • Loading branch information
donaldchai authored and copybara-github committed Aug 12, 2019
1 parent a32217f commit c018f60
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 785 deletions.
14 changes: 0 additions & 14 deletions src/test/java/com/google/devtools/build/android/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -257,20 +257,6 @@ java_test(
],
)

java_test(
name = "SplitConfigurationFilterTest",
size = "small",
srcs = ["SplitConfigurationFilterTest.java"],
deps = [
"//src/tools/android/java/com/google/devtools/build/android:android_builder_lib",
"//third_party:guava",
"//third_party:guava-testlib",
"//third_party:jsr305",
"//third_party:junit4",
"//third_party:truth",
],
)

java_test(
name = "UnvalidatedAndroidDataTest",
size = "small",
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import com.google.devtools.build.android.Converters.SerializedAndroidDataListConverter;
import com.google.devtools.build.android.Converters.UnvalidatedAndroidDataConverter;
import com.google.devtools.build.android.Converters.VariantTypeConverter;
import com.google.devtools.build.android.SplitConfigurationFilter.UnrecognizedSplitsException;
import com.google.devtools.common.options.Converters;
import com.google.devtools.common.options.Converters.CommaSeparatedOptionListConverter;
import com.google.devtools.common.options.Option;
Expand Down Expand Up @@ -476,7 +475,6 @@ public static void main(String[] args) throws Exception {
options.packageForR,
new FlagAaptOptions(aaptConfigOptions),
aaptConfigOptions.resourceConfigs,
aaptConfigOptions.splits,
processedData,
resourceData,
generatedSources,
Expand Down Expand Up @@ -524,10 +522,7 @@ public static void main(String[] args) throws Exception {
} catch (MergingException e) {
logger.log(java.util.logging.Level.SEVERE, "Error during merging resources", e);
throw e;
} catch (IOException
| InterruptedException
| LoggedErrorException
| UnrecognizedSplitsException e) {
} catch (IOException | InterruptedException | LoggedErrorException e) {
logger.log(java.util.logging.Level.SEVERE, "Error during processing resources", e);
throw e;
} catch (AndroidManifestProcessor.ManifestProcessingException e) {
Expand Down
Loading

0 comments on commit c018f60

Please sign in to comment.