am b52bfbb1: am 5025593d: Merge "dumpstate: switch to HAL static libraries" into klp-dev (c8919373) · Commits · e / os / android_frameworks_native

cmds/dumpstate/Android.mk

+6 −6

Original line number	Diff line number	Diff line
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)
		LOCAL_SRC_FILES := libdumpstate_default.c
		LOCAL_MODULE := libdumpstate.default
		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)

		ifdef BOARD_WLAN_DEVICE
		@@ -10,12 +15,7 @@ LOCAL_SRC_FILES := dumpstate.c utils.c
		LOCAL_MODULE := dumpstate

		LOCAL_SHARED_LIBRARIES := libcutils liblog libselinux

		ifdef BOARD_LIB_DUMPSTATE
		LOCAL_STATIC_LIBRARIES := $(BOARD_LIB_DUMPSTATE)
		LOCAL_CFLAGS += -DBOARD_HAS_DUMPSTATE
		endif

		LOCAL_HAL_STATIC_LIBRARIES := libdumpstate
		LOCAL_CFLAGS += -Wall -Wno-unused-parameter -std=gnu99

		include $(BUILD_EXECUTABLE)

+0 −2

Original line number	Diff line number	Diff line
		@@ -244,14 +244,12 @@ static void dumpstate() {
		dump_file("BINDER STATS", "/sys/kernel/debug/binder/stats");
		dump_file("BINDER STATE", "/sys/kernel/debug/binder/state");

		#ifdef BOARD_HAS_DUMPSTATE
		printf("========================================================\n");
		printf("== Board\n");
		printf("========================================================\n");

		dumpstate_board();
		printf("\n");
		#endif

		/* Migrate the ril_dumpstate to a dumpstate_board()? */
		char ril_dumpstate_timeout[PROPERTY_VALUE_MAX] = {0};

0 → 100644

+22 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 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.
		*/

		#include "dumpstate.h"

		void dumpstate_board(void)
		{
		}