StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add c/a/i/u/* to the list of injar filters" am: 9198da8c21

Browse Source 
am: 23eb5019bc

Change-Id: I0b26fedd90ae646d247a6b93fac92f28ec8c4b9b
This commit is contained in:
Paul Duffin
2017-05-15 15:51:51 +00:00
committed by android-build-merger
parent b83a34bf9e 23eb5019bc
commit c4977665f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java.mk
View File

@@ -609,7 +609,7 @@ extra_input_jar :=
endif
# If not using jack and building against the current SDK version then filter
# out junit and android.test classes from the application that are to be
# out the junit, android.test and c.a.i.u.Predicate classes that are to be
# removed from the Android API as part of b/30188076 but which are still
# present in the Android API. This is to allow changes to be made to the
# build to statically include those classes into the application without
@@ -618,7 +618,7 @@ proguard_injar_filters :=
ifndef LOCAL_JACK_ENABLED
ifdef LOCAL_SDK_VERSION
ifeq (,$(filter-out current system_current test_current, $(LOCAL_SDK_VERSION)))
proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!android/test/**)
proguard_injar_filters := (!junit/framework/**,!junit/runner/**,!android/test/**,!com/android/internal/util/*)
endif
endif
endif