diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-15 23:50:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-15 23:50:25 +0000 |
| commit | ae5e913146e8840b1e692f92299473268f90f415 (patch) | |
| tree | bf21d4e81be52c8053f38104d58b4c94a7d1c2b6 | |
| parent | d3148c72ed5320a517573a57cf7eb9e86a5af228 (diff) | |
| parent | fc0498f0dd9af3c86b67d0536fceaf9ed04781fb (diff) | |
| download | libcore-ae5e913146e8840b1e692f92299473268f90f415.zip libcore-ae5e913146e8840b1e692f92299473268f90f415.tar.gz libcore-ae5e913146e8840b1e692f92299473268f90f415.tar.bz2 | |
Merge "Remove unnecessary include directives."
| -rw-r--r-- | NativeCode.mk | 4 | ||||
| -rw-r--r-- | luni/src/main/native/sub.mk | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index c06431f..5ed3d1e 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -97,7 +97,7 @@ include $(CLEAR_VARS) LOCAL_CFLAGS += $(core_cflags) LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_SRC_FILES += $(core_test_files) -LOCAL_C_INCLUDES += libcore/include external/openssl/include +LOCAL_C_INCLUDES += libcore/include LOCAL_SHARED_LIBRARIES += libcrypto LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacoretests @@ -136,7 +136,7 @@ ifeq ($(LIBCORE_SKIP_TESTS),) LOCAL_CLANG := true LOCAL_SRC_FILES += $(core_test_files) LOCAL_CFLAGS += $(core_cflags) - LOCAL_C_INCLUDES += libcore/include external/openssl/include + LOCAL_C_INCLUDES += libcore/include LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_LDLIBS += -ldl -lpthread LOCAL_MODULE_TAGS := optional diff --git a/luni/src/main/native/sub.mk b/luni/src/main/native/sub.mk index 079ecd2..ebd0f59 100644 --- a/luni/src/main/native/sub.mk +++ b/luni/src/main/native/sub.mk @@ -57,13 +57,6 @@ LOCAL_SRC_FILES := \ sun_misc_Unsafe.cpp \ valueOf.cpp \ -LOCAL_C_INCLUDES += \ - external/icu/icu4c/source/common \ - external/icu/icu4c/source/i18n \ - external/openssl/include \ - external/zlib \ - system/core/include \ - LOCAL_STATIC_LIBRARIES += \ libfdlibm \ |