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

Commit b29045ce authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Convert incident_report and incident-section-gen to Android.bp" into oc-mr1-dev-plus-aosp 

am: 2dae0e24

Change-Id: I2abad0b8486a3d632d5b186b53d7ff3f89318993
parents 887e7c16 2dae0e24

tools/incident_report/Android.bp

0 → 100644
+35 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2015 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.

//



// ==========================================================

// Build the host executable: incident_report

// ==========================================================

cc_binary_host {

    name: "incident_report",



    srcs: [

        "generic_message.cpp",

        "main.cpp",

        "printer.cpp",

    ],



    shared_libs: [

        "libplatformprotos",

        "libprotobuf-cpp-full",

    ],



    cflags: ["-Wno-unused-parameter"],

}

tools/incident_report/Android.mk

deleted100644 → 0
+0 −41
Original line number Diff line number Diff line 
#

# Copyright (C) 2015 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)



# ==========================================================

# Build the host executable: protoc-gen-javastream

# ==========================================================

include $(CLEAR_VARS)



LOCAL_MODULE := incident_report



LOCAL_C_INCLUDES := \

    external/protobuf/src



LOCAL_SRC_FILES := \

    generic_message.cpp \

    main.cpp \

    printer.cpp



LOCAL_SHARED_LIBRARIES := \

    libplatformprotos \

    libprotobuf-cpp-full



LOCAL_C_FLAGS := \

    -Wno-unused-parameter

include $(BUILD_HOST_EXECUTABLE)

tools/incident_section_gen/Android.bp

0 → 100644
+31 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2015 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.

//



// ==========================================================

// Build the host executable: incident-section-gen

// ==========================================================

cc_binary_host {

    name: "incident-section-gen",

    cflags: [

        "-g",

        "-O0",

    ],

    srcs: ["main.cpp"],

    shared_libs: [

        "libplatformprotos",

        "libprotobuf-cpp-full",

    ],

}

tools/incident_section_gen/Android.mk

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
#

# Copyright (C) 2015 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)



# ==========================================================

# Build the host executable: protoc-gen-javastream

# ==========================================================

include $(CLEAR_VARS)



LOCAL_MODULE := incident-section-gen

LOCAL_CFLAGS += -g -O0

LOCAL_C_INCLUDES := \

    external/protobuf/src

LOCAL_SRC_FILES := \

    main.cpp

LOCAL_LDFLAGS := -ldl

LOCAL_SHARED_LIBRARIES := \

    libplatformprotos \

    libprotobuf-cpp-full



include $(BUILD_HOST_EXECUTABLE)