commit ec811144cbc32ec283a172012fcca01e1c12fa9c
author Dan Willemsen <dwillemsen@google.com> Mon Jul 06 19:52:25 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 06 19:52:38 2015 +0000
tree 3cf364059e5603a4874f7c1f095ae2a75307944d
parent c75f957deee09addbd67e5062b025029acb51ec8
parent 0b8b57e26114adc0e7218ab56de20d308d52a110

Merge "Use exclude_srcs instead of "-file"" into master-soong

Android.bp

diff --git a/Android.bp b/Android.bp
index 0ff7818..0b97889 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,11 +105,13 @@
 icu4j_root = "../external/icu/icu4j"
 icu4j_src_files = [
     icu4j_root + "/main/classes/**/*.java",
+]
+icu4j_exclude_src_files = [
     // Filter out bits of ICU4J we don't use yet : the SPIs (which we have limited support for),
     // the charset encoders and the transliterators.
-    "-" + icu4j_root + "/main/classes/localespi/**/*.java",
-    "-" + icu4j_root + "/main/classes/charset/**/*.java",
-    "-" + icu4j_root + "/main/classes/translit/**/*.java",
+    icu4j_root + "/main/classes/localespi/**/*.java",
+    icu4j_root + "/main/classes/charset/**/*.java",
+    icu4j_root + "/main/classes/translit/**/*.java",
 ]
 
 // Not all src dirs contain resources, some instead contain other random files
@@ -119,16 +121,20 @@
 
 icu4j_resource_dirs = [
     icu4j_root + "/main/classes/*/src",
-    "-" + icu4j_root + "/main/classes/localespi/src",
-    "-" + icu4j_root + "/main/classes/charset/src",
-    "-" + icu4j_root + "/main/classes/translit/src",
+]
+icu4j_exclude_resource_dirs = [
+    icu4j_root + "/main/classes/localespi/src",
+    icu4j_root + "/main/classes/charset/src",
+    icu4j_root + "/main/classes/translit/src",
 ]
 
 // Definitions to make the core library.
 
 java_library {
     srcs: libart_core_src_files + icu4j_src_files,
+    exclude_srcs: icu4j_exclude_src_files,
     java_resource_dirs: core_resource_dirs + icu4j_resource_dirs,
+    exclude_java_resource_dirs: icu4j_exclude_resource_dirs,
     no_standard_libraries: true,
     javacflags: local_javac_flags,
     dxflags: ["--core-library"],