diff options
| author | Colin Cross <ccross@android.com> | 2019-03-29 11:05:21 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-03-29 12:41:25 -0700 |
| commit | 0a2d8cbb26b5cca5b87d286cc676c7cf8adb5898 (patch) | |
| tree | c3fc17fefed667787f0152cb1616f00170b7d0e0 | |
| parent | 1bf4cace33b2a6eeb38c8b5ae3e5d99d8d1614b3 (diff) | |
Convert frameworks/base/cmds/media and bmgr to Android.bp
See build/soong/README.md for more information.
Bug: 122332340
Test: m media
Test: m RunBackupFrameworksServicesRoboTests
Change-Id: Ieb54feb3902bddfd5a571369fbf50161ae646647
| -rw-r--r-- | cmds/bmgr/Android.bp | 8 | ||||
| -rw-r--r-- | cmds/bmgr/Android.mk | 16 | ||||
| -rw-r--r-- | cmds/media/Android.bp | 8 | ||||
| -rw-r--r-- | cmds/media/Android.mk | 15 | ||||
| -rwxr-xr-x | cmds/media/media | 2 | ||||
| -rw-r--r-- | services/robotests/backup/Android.mk | 2 |
6 files changed, 18 insertions, 33 deletions
diff --git a/cmds/bmgr/Android.bp b/cmds/bmgr/Android.bp new file mode 100644 index 000000000000..b64923bcbe1b --- /dev/null +++ b/cmds/bmgr/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2007 The Android Open Source Project +// + +java_binary { + name: "bmgr", + wrapper: "bmgr", + srcs: ["**/*.java"], +} diff --git a/cmds/bmgr/Android.mk b/cmds/bmgr/Android.mk deleted file mode 100644 index d520cf2143ee..000000000000 --- a/cmds/bmgr/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2007 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := bmgrlib -LOCAL_MODULE_STEM := bmgr -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := bmgr -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := bmgr -LOCAL_REQUIRED_MODULES := bmgrlib -include $(BUILD_PREBUILT) diff --git a/cmds/media/Android.bp b/cmds/media/Android.bp new file mode 100644 index 000000000000..7879c53684a7 --- /dev/null +++ b/cmds/media/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2013 The Android Open Source Project +// + +java_binary { + name: "media", + wrapper: "media", + srcs: ["**/*.java"], +} diff --git a/cmds/media/Android.mk b/cmds/media/Android.mk deleted file mode 100644 index b9451c596da0..000000000000 --- a/cmds/media/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2013 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := media_cmd -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := media -LOCAL_SRC_FILES := media -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/media/media b/cmds/media/media index 5c0eb2f39c2d..8ada9145a4f7 100755 --- a/cmds/media/media +++ b/cmds/media/media @@ -3,5 +3,5 @@ # shell. # base=/system -export CLASSPATH=$base/framework/media_cmd.jar +export CLASSPATH=$base/framework/media.jar exec app_process $base/bin com.android.commands.media.Media "$@" diff --git a/services/robotests/backup/Android.mk b/services/robotests/backup/Android.mk index cc59b0c9bb16..bd4ebbd393fa 100644 --- a/services/robotests/backup/Android.mk +++ b/services/robotests/backup/Android.mk @@ -26,7 +26,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRIVILEGED_MODULE := true LOCAL_STATIC_JAVA_LIBRARIES := \ - bmgrlib \ + bmgr \ bu \ services.backup \ services.core \ |