diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-07-06 19:52:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-06 19:52:36 +0000 |
| commit | b1e2415d40cfa1e5a5f6a0b091bad8830e41e7d5 (patch) | |
| tree | fa131aa4dd0d9583a0be16759418eeafc695054c | |
| parent | 6c5826543015242cd08bc785f1e77b09d24e15db (diff) | |
| parent | 051fa9d2386b9a95d9a13441cc0c4391e33538e4 (diff) | |
| download | okhttp-b1e2415d40cfa1e5a5f6a0b091bad8830e41e7d5.tar.gz | |
Merge "Use exclude_srcs instead of "-file"" into master-soongmaster-soong
| -rw-r--r-- | Android.bp | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -18,8 +18,8 @@ okhttp_common_src_files = ["okhttp/src/main/java/**/*.java"] okhttp_common_src_files += ["okhttp-urlconnection/src/main/java/**/*.java"] okhttp_common_src_files += ["okhttp-android-support/src/main/java/**/*.java"] okhttp_common_src_files += ["okio/okio/src/main/java/**/*.java"] -okhttp_system_src_files = okhttp_common_src_files + ["-okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java"] -okhttp_system_src_files += ["android/main/java/**/*.java"] +okhttp_system_src_files = okhttp_common_src_files + ["android/main/java/**/*.java"] +okhttp_system_exclude_src_files = ["okhttp/src/main/java/com/squareup/okhttp/internal/Platform.java"] okhttp_test_src_files = ["okhttp-tests/src/test/java/**/*.java"] okhttp_test_src_files += ["okhttp-urlconnection/src/test/java/**/*.java"] @@ -34,6 +34,7 @@ okhttp_test_src_files += ["okhttp-ws-tests/src/test/java/**/*.java"] java_library { name: "okhttp", srcs: okhttp_system_src_files, + exclude_srcs: okhttp_system_exclude_src_files, jarjar_rules: "jarjar-rules.txt", java_libs: [ "core-libart", @@ -51,6 +52,7 @@ java_library { java_library_static { name: "okhttp-nojarjar", srcs: okhttp_system_src_files, + exclude_srcs: okhttp_system_exclude_src_files, java_libs: [ "core-libart", "conscrypt", |