diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-10 02:05:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-10 02:05:05 +0000 |
| commit | 2e9ec5f0de4c69cd97640ae9de38da84f9352f21 (patch) | |
| tree | 26c20cbe9f92844358e382c040e5c00edfd23f8e /cmds/am | |
| parent | ac2e9ba5308500fc358b270a4fa5e9178ab4db7e (diff) | |
| parent | 59225490b858294a737bbe62aed4850543bf4b10 (diff) | |
Merge changes I93cf24d4,I32e438ef am: 30798ad13a am: c28d591b36
am: 59225490b8
Change-Id: I6cf57e951900b3df816070feee0d3bf92a6a5a7d
Diffstat (limited to 'cmds/am')
| -rw-r--r-- | cmds/am/Android.bp | 11 | ||||
| -rw-r--r-- | cmds/am/Android.mk | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/cmds/am/Android.bp b/cmds/am/Android.bp new file mode 100644 index 000000000000..7eb4edfecbf9 --- /dev/null +++ b/cmds/am/Android.bp @@ -0,0 +1,11 @@ +// Copyright 2008 The Android Open Source Project +// + +cc_library_host_static { + name: "libinstrumentation", + srcs: ["**/*.proto"], + proto: { + type: "full", + export_proto_headers: true, + }, +} diff --git a/cmds/am/Android.mk b/cmds/am/Android.mk index 5586dd4e5b18..9411c3203ab8 100644 --- a/cmds/am/Android.mk +++ b/cmds/am/Android.mk @@ -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) - |