ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

am d72ff140: Merge "Move frameworks/native to libc++."

Browse Source 
* commit 'd72ff140e0df44106cd8539396ce686aa8f3306a':
  Move frameworks/native to libc++.
This commit is contained in:
Dan Albert 2014-11-16 17:31:57 +00:00 committed by Android Git Automerger
commit 36ec7a8b99
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
opengl/libs/GLES_trace/Android.mk
View File

@ -20,8 +20,8 @@ LOCAL_C_INCLUDES := \
external \ external \
LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI LOCAL_CFLAGS := -DGOOGLE_PROTOBUF_NO_RTTI
LOCAL_STATIC_LIBRARIES := libprotobuf-cpp-2.3.0-lite liblzf LOCAL_STATIC_LIBRARIES := liblzf
LOCAL_SHARED_LIBRARIES := libcutils libutils liblog LOCAL_SHARED_LIBRARIES := libcutils libutils liblog libprotobuf-cpp-lite
LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\" LOCAL_CFLAGS += -DLOG_TAG=\"libGLES_trace\"
@ -31,5 +31,4 @@ LOCAL_C_INCLUDES += bionic/libc/private
LOCAL_MODULE:= libGLES_trace LOCAL_MODULE:= libGLES_trace
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

12
services/inputflinger/tests/Android.mk
View File

@ -16,20 +16,11 @@ shared_libraries := \
libhardware_legacy \ libhardware_legacy \
libui \ libui \
libskia \ libskia \
libstlport \
libinput \ libinput \
libinputflinger \ libinputflinger \
libinputservice libinputservice
static_libraries := \
libgtest \
libgtest_main
c_includes := \ c_includes := \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport \
external/skia/include/core external/skia/include/core
@ -38,9 +29,8 @@ module_tags := eng tests
$(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \ $(eval include $(CLEAR_VARS)) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \
$(eval LOCAL_C_INCLUDES := $(c_includes)) \ $(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_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \ $(eval LOCAL_MODULE_TAGS := $(module_tags)) \