resolve merge conflicts of 35ea9f85 to nyc-mr1-dev-plus-aosp

subdirs = [

    "cmds/*",

    "libs/*",

    "opengl/*",

    "services/*",

]

// Copyright 2012 The Android Open Source Project

cc_binary {

    name: "atrace",

    srcs: ["atrace.cpp"],

    shared_libs: [

        "libbinder",

        "libcutils",

        "libutils",

        "libz",

        "libbase",

    ],

    init_rc: ["atrace.rc"],

}

# Copyright 2012 The Android Open Source Project

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= atrace.cpp

LOCAL_C_INCLUDES += external/zlib

LOCAL_MODULE:= atrace

LOCAL_MODULE_TAGS:= optional

LOCAL_SHARED_LIBRARIES := \

    libbinder \

    libcutils \

    libutils \

    libz \

    libbase

LOCAL_INIT_RC := atrace.rc

include $(BUILD_EXECUTABLE)

cc_binary {

    name: "bugreport",

    srcs: ["bugreport.cpp"],

    cflags: ["-Wall"],

    shared_libs: ["libcutils"],

}

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

LOCAL_SRC_FILES:= bugreport.cpp

LOCAL_MODULE:= bugreport

LOCAL_CFLAGS := -Wall

LOCAL_SHARED_LIBRARIES := libcutils

include $(BUILD_EXECUTABLE)