diff options
| author | Colin Cross <ccross@android.com> | 2019-03-28 22:31:35 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-06-06 09:02:46 -0700 |
| commit | 37d4c0054dc98ba8206957c3bcc242c79e9fc7b1 (patch) | |
| tree | 3adfe8afe34faa15e95b53edf1b61034d8be126b /cmds/am | |
| parent | 985f1299cf8be14c0e4c121cc79df8498d9cf49d (diff) | |
Convert frameworks/base/cmds/* to Android.bp
See build/soong/README.md for more information.
Also converts the rest of frameworks/base/tools/streaming_proto.
Bug: 122332340
Test: m checkbuild
Change-Id: I87c500c5464fb1722b4b518d89065f5e1ee29a97
(cherry picked from commit 45c0d71e774c84ec81392393a0fafad398d2838d)
Diffstat (limited to 'cmds/am')
| -rw-r--r-- | cmds/am/Android.bp | 13 | ||||
| -rw-r--r-- | cmds/am/Android.mk | 18 |
2 files changed, 13 insertions, 18 deletions
diff --git a/cmds/am/Android.bp b/cmds/am/Android.bp index bb16df1d159d..ed73d5596859 100644 --- a/cmds/am/Android.bp +++ b/cmds/am/Android.bp @@ -10,3 +10,16 @@ cc_library_host_static { export_proto_headers: true, }, } + +java_binary { + name: "am", + wrapper: "am", + srcs: [ + "src/**/*.java", + "proto/**/*.proto", + ], + proto: { + plugin: "javastream", + }, + static_libs: ["libprotobuf-java-lite"], +} diff --git a/cmds/am/Android.mk b/cmds/am/Android.mk deleted file mode 100644 index 9411c3203ab8..000000000000 --- a/cmds/am/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2008 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) \ - $(call all-proto-files-under, proto) -LOCAL_MODULE := am -LOCAL_PROTOC_OPTIMIZE_TYPE := stream -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := am -LOCAL_SRC_FILES := am -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) |