diff options
| -rw-r--r-- | build/Android.bp | 1 | ||||
| -rw-r--r-- | build/Android.common_build.mk | 1 | ||||
| -rw-r--r-- | build/Android.gtest.mk | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/build/Android.bp b/build/Android.bp index 630cf3c75f..4be43ec439 100644 --- a/build/Android.bp +++ b/build/Android.bp @@ -140,7 +140,6 @@ art_global_defaults { }, include_dirs: [ - "external/gtest/include", "external/icu/icu4c/source/common", "external/lz4/lib", "external/valgrind/include", diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 04a034463b..2e1434b503 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -87,7 +87,6 @@ ART_TARGET_CLANG := true ART_CPP_EXTENSION := .cc ART_C_INCLUDES := \ - external/gtest/include \ external/icu/icu4c/source/common \ external/lz4/lib \ external/valgrind/include \ diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index c09241a38a..0340e10ec7 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -634,6 +634,7 @@ define define-art-gtest LOCAL_SRC_FILES := $$(art_gtest_filename) LOCAL_C_INCLUDES += $$(ART_C_INCLUDES) art/runtime art/cmdline $$(art_gtest_extra_c_includes) LOCAL_SHARED_LIBRARIES += libartd $$(art_gtest_extra_shared_libraries) libart-gtest libartd-disassembler + LOCAL_STATIC_LIBRARIES += libgtest LOCAL_WHOLE_STATIC_LIBRARIES += libsigchain LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk |