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

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

Merge changes I93cf24d4,I32e438ef 

am: 30798ad1

Change-Id: I0b178c8523d0c5829d731f6ed05cfa3fe89ad9b4
parents 972a9d53 30798ad1

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ cc_library { 
}



subdirs = [

    "cmds/*",

    "core/jni",

    "libs/*",

    "media/*",

cmds/am/Android.bp

0 → 100644
+11 −0
Original line number Diff line number Diff line 
// Copyright 2008 The Android Open Source Project

//



cc_library_host_static {

    name: "libinstrumentation",

    srcs: ["**/*.proto"],

    proto: {

        type: "full",

        export_proto_headers: true,

    },

}

cmds/am/Android.mk

+0 −11
Original line number Diff line number Diff line
@@ -16,14 +16,3 @@ LOCAL_SRC_FILES := am 
LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE_TAGS := optional

include $(BUILD_PREBUILT)
 




include $(CLEAR_VARS)

LOCAL_SRC_FILES := \

    $(call all-proto-files-under, proto)

LOCAL_MODULE := libinstrumentation

LOCAL_PROTOC_OPTIMIZE_TYPE := full

LOCAL_EXPORT_C_INCLUDE_DIRS := \

    $(call intermediates-dir-for,STATIC_LIBRARIES,libinstrumentation,HOST,,,)/proto/$(LOCAL_PATH)/proto

include $(BUILD_HOST_STATIC_LIBRARY)

cmds/interrupter/Android.bp

0 → 100644
+11 −0
Original line number Diff line number Diff line 
cc_library_shared {

    name: "interrupter",

    host_supported: true,

    srcs: ["interrupter.c"],

    cflags: [

        "-Wall",

        "-Werror",

        "-Wunused",

        "-Wunreachable-code",

    ],

}

cmds/interrupter/Android.mk

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
LOCAL_PATH := $(call my-dir)



include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

    interrupter.c

LOCAL_MODULE := interrupter

LOCAL_MODULE_TAGS := eng tests

LOCAL_LDFLAGS := -ldl

LOCAL_CFLAGS := -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_SHARED_LIBRARY)



include $(CLEAR_VARS)



LOCAL_SRC_FILES := \

    interrupter.c

LOCAL_MODULE := interrupter

LOCAL_MODULE_TAGS := eng tests

LOCAL_LDFLAGS := -ldl

LOCAL_CFLAGS := -Wall -Werror -Wunused -Wunreachable-code



include $(BUILD_HOST_SHARED_LIBRARY)