Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36ec7a8b authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

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

* commit 'd72ff140':
  Move frameworks/native to libc++.
parents 3fd6b2b9 d72ff140

opengl/libs/GLES_trace/Android.mk

+2 −3
Original line number Diff line number Diff line
@@ -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)

services/inputflinger/tests/Android.mk

+1 −11
Original line number Diff line number Diff line
@@ -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,7 +29,6 @@ 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_SRC_FILES := $(file)) \