diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-01 11:32:12 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-04-01 11:32:12 +0100 |
| commit | 3142d93869e2c24d3ee9bcd3b720e03619486062 (patch) | |
| tree | 77fc12e56b6e66fa3f36ef84558e8cf27a1a1622 /JavaLibrary.mk | |
| parent | b371767ccbd9cbe5fdd588ea3b60cf597267902f (diff) | |
| download | libcore-3142d93869e2c24d3ee9bcd3b720e03619486062.tar.gz libcore-3142d93869e2c24d3ee9bcd3b720e03619486062.tar.bz2 libcore-3142d93869e2c24d3ee9bcd3b720e03619486062.zip | |
Exclude resources from charset/translit/localespi.
We're not building sources so we shouldn't build resource either.
Even if we *were* building charset, we wouldn't want the ICU
charset provider SPI queried by default.
Fixes errors in the ART buildbot and CTS.
Change-Id: Ia3b1ca1e14cadaca99c6a616e13b7bb2792aa848
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 9051d25e9..9f6d8273b 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -90,9 +90,12 @@ define all-icu-subdir-with-subdir $(patsubst $(LOCAL_PATH)/%/$(2),%,$(wildcard $(LOCAL_PATH)/$(1)/$(2))) endef -icu4j_resource_dirs := \ - $(filter-out $(icu4j_root)/main/classes/localespi/%, \ - $(call all-icu-subdir-with-subdir,$(icu4j_root)/main/classes/*/src,com/ibm/icu)) +icu4j_resource_dirs := $(call all-icu-subdir-with-subdir,$(icu4j_root)/main/classes/*/src,com/ibm/icu) +icu4j_resource_dirs := $(filter-out $(icu4j_root)/main/classes/localespi/%, $(icu4j_resource_dirs)) +icu4j_resource_dirs := $(filter-out $(icu4j_root)/main/classes/charset/%, $(icu4j_resource_dirs)) +icu4j_resource_dirs := $(filter-out $(icu4j_root)/main/classes/translit/%, $(icu4j_resource_dirs)) + + # # Build for the target (device). |