openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Handle Jacoco filters 

Test: treehugger
Change-Id: I8bf242cdb4709d086ff0806c143ff03ad2e5cd30
This commit is contained in:
Sasha Smundak 2019-01-08 19:19:21 -08:00 committed by Alexander Smundak
parent 6cf911150a
commit e5c5317f44
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
androidmk/cmd/androidmk/android.go
View File

@ -158,6 +158,10 @@ func init() {
"LOCAL_SHARED_ANDROID_LIBRARIES": "android_libs", "LOCAL_SHARED_ANDROID_LIBRARIES": "android_libs",
"LOCAL_STATIC_ANDROID_LIBRARIES": "android_static_libs", "LOCAL_STATIC_ANDROID_LIBRARIES": "android_static_libs",
"LOCAL_ADDITIONAL_CERTIFICATES": "additional_certificates", "LOCAL_ADDITIONAL_CERTIFICATES": "additional_certificates",
// Jacoco filters:
"LOCAL_JACK_COVERAGE_INCLUDE_FILTER": "jacoco.include_filter",
"LOCAL_JACK_COVERAGE_EXCLUDE_FILTER": "jacoco.exclude_filter",
}) })
addStandardProperties(bpparser.BoolType, addStandardProperties(bpparser.BoolType,

8
androidmk/cmd/androidmk/androidmk_test.go
View File

@ -643,12 +643,14 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := test.java LOCAL_SRC_FILES := test.java
LOCAL_RESOURCE_DIR := res LOCAL_RESOURCE_DIR := res
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := foo.*
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := test.java LOCAL_SRC_FILES := test.java
LOCAL_STATIC_LIBRARIES := foo LOCAL_STATIC_LIBRARIES := foo
LOCAL_STATIC_ANDROID_LIBRARIES := bar LOCAL_STATIC_ANDROID_LIBRARIES := bar
LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := bar.*
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -666,6 +668,9 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
android_library { android_library {
srcs: ["test.java"], srcs: ["test.java"],
resource_dirs: ["res"], resource_dirs: ["res"],
jacoco: {
include_filter: ["foo.*"],
},
} }
android_library { android_library {
@ -674,6 +679,9 @@ include $(call all-makefiles-under,$(LOCAL_PATH))
"foo", "foo",
"bar", "bar",
], ],
jacoco: {
exclude_filter: ["bar.*"],
},
} }
android_library { android_library {