1481fe142d
Previously, pulled data was returned as a string. We instead return the data as an array of StatsLogEventWrapper, which encodes using the binary-encoded format liblog uses. StatsD uses the same parsing as for pushed events to convert these. This CL also fixes the parsing of log_msg since the strings were previously emptied before we had a chance to read the values. Note that the cpp-aidl can't support List of Parcelable, so we have to return the results as an array. Test: Manual using the new command in StatsService to print results. Also created a new unit-test by creating a dummy pull code of -1, but this test is deleted since it required creating a fake output in StatsCompanionService. Change-Id: I1cfb9ea081a59292a60e934e8527adc40982ed80
45 lines
1.2 KiB
Makefile
45 lines
1.2 KiB
Makefile
# Copyright (C) 2010 The Android Open Source Project
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
LOCAL_PATH:= $(call my-dir)
|
|
|
|
# Provides C++ wrappers for system services.
|
|
|
|
include $(CLEAR_VARS)
|
|
|
|
LOCAL_MODULE := libservices
|
|
LOCAL_SRC_FILES := \
|
|
../../core/java/com/android/internal/os/IDropBoxManagerService.aidl \
|
|
src/os/DropBoxManager.cpp \
|
|
src/os/StatsLogEventWrapper.cpp
|
|
|
|
LOCAL_AIDL_INCLUDES := \
|
|
$(LOCAL_PATH)/../../core/java
|
|
LOCAL_C_INCLUDES := \
|
|
system/core/include
|
|
LOCAL_SHARED_LIBRARIES := \
|
|
libbinder \
|
|
liblog \
|
|
libcutils \
|
|
libutils
|
|
|
|
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
|
|
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
|
|
|
|
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
|
|
|
|
include $(BUILD_SHARED_LIBRARY)
|
|
|
|
|