diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-15 18:18:17 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-15 18:22:55 -0800 |
| commit | 6d72063cfd28ab4e5ed9d3405c7e9389d8e78bad (patch) | |
| tree | 929de4ed7e2268e37bfbeb8e6bd714637d57af29 | |
| parent | 11bf9e5c2f90101d56d918e1b3fe780b873e5566 (diff) | |
| download | frameworks_native-6d72063cfd28ab4e5ed9d3405c7e9389d8e78bad.zip frameworks_native-6d72063cfd28ab4e5ed9d3405c7e9389d8e78bad.tar.gz frameworks_native-6d72063cfd28ab4e5ed9d3405c7e9389d8e78bad.tar.bz2 | |
Move frameworks/native to libc++.
I'm pretty sure I had done this before... Must have been new
dependencies that slipped in when L merged in.
Bug: 15193147
Change-Id: Ib9b1b8a65665d25c33c6141b9476a8e13c4084e0
| -rw-r--r-- | opengl/libs/GLES_trace/Android.mk | 5 | ||||
| -rw-r--r-- | services/inputflinger/tests/Android.mk | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/opengl/libs/GLES_trace/Android.mk b/opengl/libs/GLES_trace/Android.mk index d74f77a..7af7f69 100644 --- a/opengl/libs/GLES_trace/Android.mk +++ b/opengl/libs/GLES_trace/Android.mk @@ -20,8 +20,8 @@ LOCAL_C_INCLUDES := \ external \ LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI -LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf -LOCAL_SHARED_LIBRARIES := libcutils libutils liblog +LOCAL_STATIC_LIBRARIES := liblzf +LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libprotobuf-cpp-lite LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" @@ -31,5 +31,4 @@ LOCAL_C_INCLUDES += bionic/libc/private LOCAL_MODULE:= libGLES_trace LOCAL_MODULE_TAGS := optional -include external/stlport/libstlport.mk include $(BUILD_SHARED_LIBRARY) diff --git a/services/inputflinger/tests/Android.mk b/services/inputflinger/tests/Android.mk index 6dae82f..0742a08 100644 --- a/services/inputflinger/tests/Android.mk +++ b/services/inputflinger/tests/Android.mk @@ -16,20 +16,11 @@ shared_libraries := \ libhardware_legacy \ libui \ libskia \ - libstlport \ libinput \ libinputflinger \ libinputservice -static_libraries := \ - libgtest \ - libgtest_main - c_includes := \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ - external/stlport/stlport \ external/skia/include/core @@ -38,9 +29,8 @@ module_tags := eng tests $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ - $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ $(eval LOCAL_C_INCLUDES := $(c_includes)) \ - $(eval LOCAL_CFLAGS += -Wno-unused-parameter) \ + $(eval LOCAL_CFLAGS += -Wno-unused-parameter) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE_TAGS := $(module_tags)) \ |