diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-09-08 22:47:47 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-09-09 06:18:48 +0000 |
| commit | d3eac266b02399a8a822517e844c05585879221a (patch) | |
| tree | 9d6cefd142dd515c9e3ad946f6549f9727822c8e /cmds/am | |
| parent | 1cb5ab2dc14fb35359525479a7c7356d84904ce1 (diff) | |
Convert host tools to Android.bp
See build/soong/README.md for more information.
Test: m libinstrumentation interrupter accessorychat accessorytest bit obbtool pbkdf2gen libsplit-select_tests split-select protoc-gen-javastream validatekeymaps libaapt_tests aapt
Test: mmma frameworks/base
Test: out/host/linux-x86/nativetest64/libaapt_tests/libaapt_tests
Test: out/host/linux-x86/nativetest64/libsplit-select_tests/libsplit-select_tests
Change-Id: I93cf24d4b232353a52d53be8ed85781b8f4a3877
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) - |