diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-20 05:48:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-20 05:48:19 +0000 |
| commit | 4b8b38f4e5f216f317d9837de49468b32be86984 (patch) | |
| tree | 21f83fe0a65fc1e65db1e8fc06f462ed11afbb69 | |
| parent | 44ec58221f0128bf6ea31d49bb80dde8db083379 (diff) | |
| parent | 9c5c08be379a0fd267c5edf0c15852475ab123f3 (diff) | |
| download | system_core-4b8b38f4e5f216f317d9837de49468b32be86984.zip system_core-4b8b38f4e5f216f317d9837de49468b32be86984.tar.gz system_core-4b8b38f4e5f216f317d9837de49468b32be86984.tar.bz2 | |
Merge "Use mingw on Windows."
| -rw-r--r-- | base/Android.mk | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/base/Android.mk b/base/Android.mk index 0e1a9b6..17d6ece 100644 --- a/base/Android.mk +++ b/base/Android.mk @@ -56,7 +56,6 @@ include $(BUILD_SHARED_LIBRARY) # ------------------------------------------------------------------------------ include $(CLEAR_VARS) LOCAL_MODULE := libbase -LOCAL_CLANG := true LOCAL_SRC_FILES := $(libbase_src_files) LOCAL_C_INCLUDES := $(LOCAL_PATH)/include LOCAL_CPPFLAGS := $(libbase_cppflags) @@ -66,7 +65,6 @@ include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libbase -LOCAL_CLANG := true LOCAL_WHOLE_STATIC_LIBRARIES := libbase LOCAL_SHARED_LIBRARIES := liblog LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include @@ -88,7 +86,6 @@ include $(BUILD_NATIVE_TEST) include $(CLEAR_VARS) LOCAL_MODULE := libbase_test -LOCAL_CLANG := true LOCAL_SRC_FILES := $(libbase_test_src_files) LOCAL_CPPFLAGS := $(libbase_cppflags) LOCAL_SHARED_LIBRARIES := libbase |