diff options
Diffstat (limited to 'cmds')
62 files changed, 330 insertions, 605 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) diff --git a/cmds/app_process/Android.bp b/cmds/app_process/Android.bp new file mode 100644 index 000000000000..f92502370566 --- /dev/null +++ b/cmds/app_process/Android.bp @@ -0,0 +1,64 @@ +cc_binary { + name: "app_process", + + srcs: ["app_main.cpp"], + + multilib: { + lib32: { + version_script: ":art_sigchain_version_script32.txt", + suffix: "32", + }, + lib64: { + version_script: ":art_sigchain_version_script64.txt", + suffix: "64", + }, + }, + + ldflags: ["-Wl,--export-dynamic"], + + shared_libs: [ + "libandroid_runtime", + "libbinder", + "libcutils", + "libdl", + "libhidlbase", + "libhwbinder", + "liblog", + "libnativeloader", + "libutils", + + // This is a list of libraries that need to be included in order to avoid + // bad apps. This prevents a library from having a mismatch when resolving + // new/delete from an app shared library. + // See b/21032018 for more details. + "libwilhelm", + ], + + whole_static_libs: ["libsigchain"], + + compile_multilib: "both", + + cflags: [ + "-Wall", + "-Werror", + "-Wunused", + "-Wunreachable-code", + ], + + // If SANITIZE_LITE is revived this will need: + //product_variables: { + // sanitize_lite: { + // // In SANITIZE_LITE mode, we create the sanitized binary in a separate location (but reuse + // // the same module). Using the same module also works around an issue with make: binaries + // // that depend on sanitized libraries will be relinked, even if they set LOCAL_SANITIZE := never. + // // + // // Also pull in the asanwrapper helper. + // relative_install_path: "asan", + // required: ["asanwrapper"], + // }, + //}, + + // Create a symlink from app_process to app_process32 or 64 + // depending on the target configuration. + symlink_preferred_arch: true, +} diff --git a/cmds/app_process/Android.mk b/cmds/app_process/Android.mk deleted file mode 100644 index 570d74048e03..000000000000 --- a/cmds/app_process/Android.mk +++ /dev/null @@ -1,68 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -app_process_common_shared_libs := \ - libandroid_runtime \ - libbinder \ - libcutils \ - libdl \ - libhidlbase \ - liblog \ - libnativeloader \ - libutils \ - -# This is a list of libraries that need to be included in order to avoid -# bad apps. This prevents a library from having a mismatch when resolving -# new/delete from an app shared library. -# See b/21032018 for more details. -app_process_common_shared_libs += \ - libwilhelm \ - -app_process_common_static_libs := \ - libsigchain \ - -app_process_src_files := \ - app_main.cpp \ - -app_process_cflags := \ - -Wall -Werror -Wunused -Wunreachable-code - -app_process_ldflags_32 := \ - -Wl,--version-script,art/sigchainlib/version-script32.txt -Wl,--export-dynamic -app_process_ldflags_64 := \ - -Wl,--version-script,art/sigchainlib/version-script64.txt -Wl,--export-dynamic - -include $(CLEAR_VARS) - -LOCAL_SRC_FILES:= $(app_process_src_files) - -LOCAL_LDFLAGS_32 := $(app_process_ldflags_32) -LOCAL_LDFLAGS_64 := $(app_process_ldflags_64) - -LOCAL_SHARED_LIBRARIES := $(app_process_common_shared_libs) - -LOCAL_WHOLE_STATIC_LIBRARIES := $(app_process_common_static_libs) - -LOCAL_MODULE:= app_process -LOCAL_MULTILIB := both -LOCAL_MODULE_STEM_32 := app_process32 -LOCAL_MODULE_STEM_64 := app_process64 - -LOCAL_CFLAGS += $(app_process_cflags) - -# In SANITIZE_LITE mode, we create the sanitized binary in a separate location (but reuse -# the same module). Using the same module also works around an issue with make: binaries -# that depend on sanitized libraries will be relinked, even if they set LOCAL_SANITIZE := never. -# -# Also pull in the asanwrapper helper. -ifeq ($(SANITIZE_LITE),true) -LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/asan -LOCAL_REQUIRED_MODULES := asanwrapper -endif - -include $(BUILD_EXECUTABLE) - -# Create a symlink from app_process to app_process32 or 64 -# depending on the target configuration. -ifneq ($(SANITIZE_LITE),true) -include $(BUILD_SYSTEM)/executable_prefer_symlink.mk -endif diff --git a/cmds/appops/Android.bp b/cmds/appops/Android.bp new file mode 100644 index 000000000000..9f330fa3bb51 --- /dev/null +++ b/cmds/appops/Android.bp @@ -0,0 +1,6 @@ +// Copyright 2014 The Android Open Source Project + +sh_binary { + name: "appops", + src: "appops", +} diff --git a/cmds/appops/Android.mk b/cmds/appops/Android.mk deleted file mode 100644 index 6801ce9cd3af..000000000000 --- a/cmds/appops/Android.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2014 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := appops -LOCAL_SRC_FILES := appops -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/appwidget/Android.bp b/cmds/appwidget/Android.bp new file mode 100644 index 000000000000..487d3e1fc25f --- /dev/null +++ b/cmds/appwidget/Android.bp @@ -0,0 +1,7 @@ +// Copyright 2014 The Android Open Source Project + +java_binary { + name: "appwidget", + wrapper: "appwidget", + srcs: ["**/*.java"], +} diff --git a/cmds/appwidget/Android.mk b/cmds/appwidget/Android.mk deleted file mode 100644 index 1fb258db6cb9..000000000000 --- a/cmds/appwidget/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2014 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := appwidget -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := appwidget -LOCAL_SRC_FILES := appwidget -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) - diff --git a/cmds/appwidget/appwidget b/cmds/appwidget/appwidget index 26ab1730250f..cc70ca53d5dd 100755 --- a/cmds/appwidget/appwidget +++ b/cmds/appwidget/appwidget @@ -1,6 +1,3 @@ #!/system/bin/sh -# Script to start "appwidget" on the device, which has a very rudimentary shell. -base=/system -export CLASSPATH=$base/framework/appwidget.jar -exec app_process $base/bin com.android.commands.appwidget.AppWidget "$@" - +export CLASSPATH=/system/framework/appwidget.jar +exec app_process /system/bin com.android.commands.appwidget.AppWidget "$@" diff --git a/cmds/bmgr/bmgr b/cmds/bmgr/bmgr index 60b5833e7696..b068d10dcbcf 100755 --- a/cmds/bmgr/bmgr +++ b/cmds/bmgr/bmgr @@ -1,8 +1,3 @@ #!/system/bin/sh -# Script to start "bmgr" on the device, which has a very rudimentary -# shell. -# -base=/system -export CLASSPATH=$base/framework/bmgr.jar -exec app_process $base/bin com.android.commands.bmgr.Bmgr "$@" - +export CLASSPATH=/system/framework/bmgr.jar +exec app_process /system/bin com.android.commands.bmgr.Bmgr "$@" diff --git a/cmds/bu/Android.bp b/cmds/bu/Android.bp new file mode 100644 index 000000000000..0866ee053107 --- /dev/null +++ b/cmds/bu/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2011 The Android Open Source Project +// + +java_binary { + name: "bu", + wrapper: "bu", + srcs: ["**/*.java"], +} diff --git a/cmds/bu/Android.mk b/cmds/bu/Android.mk deleted file mode 100644 index 4fd5fecdd8b9..000000000000 --- a/cmds/bu/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2011 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := bu -LOCAL_MODULE_TAGS := optional -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := bu -LOCAL_SRC_FILES := bu -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) - - diff --git a/cmds/content/Android.bp b/cmds/content/Android.bp new file mode 100644 index 000000000000..96d14696d0a2 --- /dev/null +++ b/cmds/content/Android.bp @@ -0,0 +1,7 @@ +// Copyright 2012 The Android Open Source Project + +java_binary { + name: "content", + wrapper: "content", + srcs: ["**/*.java"], +} diff --git a/cmds/content/Android.mk b/cmds/content/Android.mk deleted file mode 100644 index 9302e2fc54db..000000000000 --- a/cmds/content/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2012 The Android Open Source Project - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := content -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := content -LOCAL_SRC_FILES := content -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/content/content b/cmds/content/content index f1bfe1737c5a..91f2dfb16ac9 100755 --- a/cmds/content/content +++ b/cmds/content/content @@ -1,6 +1,3 @@ #!/system/bin/sh -# Script to start "content" on the device, which has a very rudimentary shell. -base=/system -export CLASSPATH=$base/framework/content.jar -exec app_process $base/bin com.android.commands.content.Content "$@" - +export CLASSPATH=/system/framework/content.jar +exec app_process /system/bin com.android.commands.content.Content "$@" diff --git a/cmds/dpm/Android.bp b/cmds/dpm/Android.bp new file mode 100644 index 000000000000..753121e6d886 --- /dev/null +++ b/cmds/dpm/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2014 The Android Open Source Project +// + +java_binary { + name: "dpm", + wrapper: "dpm", + srcs: ["**/*.java"], +} diff --git a/cmds/dpm/Android.mk b/cmds/dpm/Android.mk deleted file mode 100644 index 9f5aee403f82..000000000000 --- a/cmds/dpm/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2014 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := dpm -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := dpm -LOCAL_SRC_FILES := dpm -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/hid/Android.bp b/cmds/hid/Android.bp index 2b7963aa9425..54c8bf3ef34c 100644 --- a/cmds/hid/Android.bp +++ b/cmds/hid/Android.bp @@ -1 +1,9 @@ -subdirs = ["jni"] +// Copyright 2015 The Android Open Source Project +// + +java_binary { + name: "hid", + wrapper: "hid", + srcs: ["**/*.java"], + required: ["libhidcommand_jni"], +} diff --git a/cmds/hid/Android.mk b/cmds/hid/Android.mk deleted file mode 100644 index 574834dea31d..000000000000 --- a/cmds/hid/Android.mk +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := hid -LOCAL_JNI_SHARED_LIBRARIES := libhidcommand_jni -LOCAL_REQUIRED_MODULES := libhidcommand_jni -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := hid -LOCAL_SRC_FILES := hid -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := EXECUTABLES -include $(BUILD_PREBUILT) - -include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/cmds/hid/hid b/cmds/hid/hid index 3931da1e2a85..43c76345c9e1 100755 --- a/cmds/hid/hid +++ b/cmds/hid/hid @@ -1,14 +1,9 @@ #!/system/bin/sh -# -# Script to start "hid" on the device, which has a very rudimentary -# shell. -# -base=/system -export CLASSPATH=$base/framework/hid.jar # Preload the native portion libhidcommand_jni.so to bypass the dependency # checks in the Java classloader, which prohibit dependencies that aren't # listed in system/core/rootdir/etc/public.libraries.android.txt. export LD_PRELOAD=libhidcommand_jni.so -exec app_process $base/bin com.android.commands.hid.Hid "$@" +export CLASSPATH=/system/framework/hid.jar +exec app_process /system/bin com.android.commands.hid.Hid "$@" diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp index 18d56fa87cca..3bb99298debf 100644 --- a/cmds/idmap2/Android.bp +++ b/cmds/idmap2/Android.bp @@ -222,4 +222,5 @@ filegroup { srcs: [ "idmap2d/aidl/android/os/IIdmap2.aidl", ], + path: "idmap2d/aidl", } diff --git a/cmds/idmap2/libidmap2/ZipFile.cpp b/cmds/idmap2/libidmap2/ZipFile.cpp index 812fd6eacbf9..4f5e3a45f183 100644 --- a/cmds/idmap2/libidmap2/ZipFile.cpp +++ b/cmds/idmap2/libidmap2/ZipFile.cpp @@ -45,7 +45,7 @@ ZipFile::~ZipFile() { std::unique_ptr<const MemoryChunk> ZipFile::Uncompress(const std::string& entryPath) const { ::ZipEntry entry; - int32_t status = ::FindEntry(handle_, ::ZipString(entryPath.c_str()), &entry); + int32_t status = ::FindEntry(handle_, entryPath, &entry); if (status != 0) { return nullptr; } @@ -59,7 +59,7 @@ std::unique_ptr<const MemoryChunk> ZipFile::Uncompress(const std::string& entryP Result<uint32_t> ZipFile::Crc(const std::string& entryPath) const { ::ZipEntry entry; - int32_t status = ::FindEntry(handle_, ::ZipString(entryPath.c_str()), &entry); + int32_t status = ::FindEntry(handle_, entryPath, &entry); if (status != 0) { return Error("failed to find zip entry %s", entryPath.c_str()); } diff --git a/cmds/ime/Android.bp b/cmds/ime/Android.bp new file mode 100644 index 000000000000..76a16c81ca38 --- /dev/null +++ b/cmds/ime/Android.bp @@ -0,0 +1,7 @@ +// Copyright 2007 The Android Open Source Project +// + +sh_binary { + name: "ime", + src: "ime", +} diff --git a/cmds/ime/Android.mk b/cmds/ime/Android.mk deleted file mode 100644 index ca608e8c2c34..000000000000 --- a/cmds/ime/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2007 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := ime -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := ime -include $(BUILD_PREBUILT) diff --git a/cmds/input/Android.bp b/cmds/input/Android.bp new file mode 100644 index 000000000000..a0ebde63eb6e --- /dev/null +++ b/cmds/input/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2008 The Android Open Source Project +// + +java_binary { + name: "input", + wrapper: "input", + srcs: ["**/*.java"], +} diff --git a/cmds/input/Android.mk b/cmds/input/Android.mk deleted file mode 100644 index 4e983e398ccb..000000000000 --- a/cmds/input/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2008 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := inputlib -LOCAL_MODULE_STEM := input -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := input -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := input -LOCAL_REQUIRED_MODULES := inputlib -include $(BUILD_PREBUILT) diff --git a/cmds/input/input b/cmds/input/input index 54ab94762e5c..2625eba17153 100755 --- a/cmds/input/input +++ b/cmds/input/input @@ -1,8 +1,3 @@ #!/system/bin/sh -# Script to start "input" on the device, which has a very rudimentary -# shell. -# -base=/system -export CLASSPATH=$base/framework/input.jar -exec app_process $base/bin com.android.commands.input.Input "$@" - +export CLASSPATH=/system/framework/input.jar +exec app_process /system/bin com.android.commands.input.Input "$@" diff --git a/cmds/locksettings/Android.bp b/cmds/locksettings/Android.bp new file mode 100644 index 000000000000..59ccc5cd082e --- /dev/null +++ b/cmds/locksettings/Android.bp @@ -0,0 +1,19 @@ +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +java_binary { + name: "locksettings", + wrapper: "locksettings", + srcs: ["**/*.java"], +} diff --git a/cmds/locksettings/Android.mk b/cmds/locksettings/Android.mk deleted file mode 100644 index 76766c7c6955..000000000000 --- a/cmds/locksettings/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2016 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := locksettings -LOCAL_MODULE_TAGS := optional -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := locksettings -LOCAL_SRC_FILES := locksettings -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) - - diff --git a/cmds/media/media b/cmds/media/media index 8ada9145a4f7..00c3915f2e65 100755 --- a/cmds/media/media +++ b/cmds/media/media @@ -1,7 +1,3 @@ #!/system/bin/sh -# Script to start "media_cmd" on the device, which has a very rudimentary -# shell. -# -base=/system -export CLASSPATH=$base/framework/media.jar -exec app_process $base/bin com.android.commands.media.Media "$@" +export CLASSPATH=/system/framework/media.jar +exec app_process /system/bin com.android.commands.media.Media "$@" diff --git a/cmds/pm/Android.bp b/cmds/pm/Android.bp new file mode 100644 index 000000000000..0644f6efcb8a --- /dev/null +++ b/cmds/pm/Android.bp @@ -0,0 +1,7 @@ +// Copyright 2007 The Android Open Source Project +// + +sh_binary { + name: "pm", + src: "pm", +} diff --git a/cmds/pm/Android.mk b/cmds/pm/Android.mk deleted file mode 100644 index 960c8052f935..000000000000 --- a/cmds/pm/Android.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2007 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := pm -LOCAL_SRC_FILES := pm -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/requestsync/Android.bp b/cmds/requestsync/Android.bp new file mode 100644 index 000000000000..ef2a8a6be3ca --- /dev/null +++ b/cmds/requestsync/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2012 The Android Open Source Project +// + +java_binary { + name: "requestsync", + wrapper: "requestsync", + srcs: ["**/*.java"], +} diff --git a/cmds/requestsync/Android.mk b/cmds/requestsync/Android.mk deleted file mode 100644 index fe2ffd8de4dc..000000000000 --- a/cmds/requestsync/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2012 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := requestsync -LOCAL_MODULE_TAGS := optional -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := requestsync -LOCAL_SRC_FILES := requestsync -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/settings/Android.bp b/cmds/settings/Android.bp new file mode 100644 index 000000000000..8a78e5420a5f --- /dev/null +++ b/cmds/settings/Android.bp @@ -0,0 +1,7 @@ +// Copyright 2011 The Android Open Source Project +// + +sh_binary { + name: "settings", + src: "settings", +} diff --git a/cmds/settings/Android.mk b/cmds/settings/Android.mk deleted file mode 100644 index 8a8d1bb95c66..000000000000 --- a/cmds/settings/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2011 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -include $(CLEAR_VARS) -LOCAL_MODULE := settings -LOCAL_SRC_FILES := settings -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) - - diff --git a/cmds/sm/Android.bp b/cmds/sm/Android.bp new file mode 100644 index 000000000000..11e4e72b435b --- /dev/null +++ b/cmds/sm/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2015 The Android Open Source Project +// + +java_binary { + name: "sm", + wrapper: "sm", + srcs: ["**/*.java"], +} diff --git a/cmds/sm/Android.mk b/cmds/sm/Android.mk deleted file mode 100644 index 7cb1e129d2f7..000000000000 --- a/cmds/sm/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := sm -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := sm -LOCAL_SRC_FILES := sm -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/sm/sm b/cmds/sm/sm index 4bc859e0c374..30eae00a990d 100755 --- a/cmds/sm/sm +++ b/cmds/sm/sm @@ -1,7 +1,3 @@ #!/system/bin/sh -# Script to start "sm" on the device, which has a very rudimentary -# shell. -# -base=/system -export CLASSPATH=$base/framework/sm.jar -exec app_process $base/bin com.android.commands.sm.Sm "$@" +export CLASSPATH=/system/framework/sm.jar +exec app_process /system/bin com.android.commands.sm.Sm "$@" diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index 6bedfcdfafa3..2f0dc3cb1e98 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -333,7 +333,7 @@ cc_benchmark { // ==== java proto device library (for test only) ============================== java_library { name: "statsdprotolite", - no_framework_libs: true, + sdk_version: "core_platform", proto: { type: "lite", include_dirs: ["external/protobuf/src"], diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index 3d060feff70e..f76037af0508 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -5301,7 +5301,7 @@ message NetworkDnsEventReported { // Only valid for event_type = EVENT_RESNSEND. optional int32 res_nsend_flags = 5; - optional android.stats.dnsresolver.Transport network_type = 6; + optional android.stats.dnsresolver.NetworkType network_type = 6; // The DNS over TLS mode on a specific netId. optional android.stats.dnsresolver.PrivateDnsModes private_dns_modes = 7; diff --git a/cmds/svc/Android.bp b/cmds/svc/Android.bp new file mode 100644 index 000000000000..68b48f11e5a6 --- /dev/null +++ b/cmds/svc/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2007 The Android Open Source Project +// + +java_binary { + name: "svc", + wrapper: "svc", + srcs: ["**/*.java"], +} diff --git a/cmds/svc/Android.mk b/cmds/svc/Android.mk deleted file mode 100644 index a4824c70f979..000000000000 --- a/cmds/svc/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 := svclib -LOCAL_MODULE_STEM := svc -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := svc -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_SRC_FILES := svc -LOCAL_REQUIRED_MODULES := svclib -include $(BUILD_PREBUILT) diff --git a/cmds/svc/svc b/cmds/svc/svc index 07b50fe6c7b5..c122e981e4c7 100755 --- a/cmds/svc/svc +++ b/cmds/svc/svc @@ -1,8 +1,3 @@ #!/system/bin/sh -# Script to start "am" on the device, which has a very rudimentary -# shell. -# -base=/system -export CLASSPATH=$base/framework/svc.jar -exec app_process $base/bin com.android.commands.svc.Svc $* - +export CLASSPATH=/system/framework/svc.jar +exec app_process /system/bin com.android.commands.svc.Svc "$@" diff --git a/cmds/telecom/Android.bp b/cmds/telecom/Android.bp new file mode 100644 index 000000000000..56e147c5c8ca --- /dev/null +++ b/cmds/telecom/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2015 The Android Open Source Project +// + +java_binary { + name: "telecom", + wrapper: "telecom", + srcs: ["**/*.java"], +} diff --git a/cmds/telecom/Android.mk b/cmds/telecom/Android.mk deleted file mode 100644 index 5f7bdf706355..000000000000 --- a/cmds/telecom/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2015 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := telecom -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := telecom -LOCAL_SRC_FILES := telecom -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/uiautomator/Android.bp b/cmds/uiautomator/Android.bp new file mode 100644 index 000000000000..f9cb3dd38897 --- /dev/null +++ b/cmds/uiautomator/Android.bp @@ -0,0 +1,18 @@ +genrule { + name: "uiautomator-last-released-api", + srcs: ["api/*.txt"], + cmd: "cp -f $$(echo $(in) | tr \" \" \"\\n\" | sort -n | tail -1) $(genDir)/last-released-api.txt", + out: [ + "last-released-api.txt", + ], +} + +filegroup { + name: "uiautomator-current-api", + srcs: ["api/current.txt"], +} + +filegroup { + name: "uiautomator-removed-api", + srcs: ["api/removed.txt"], +} diff --git a/cmds/uiautomator/Android.mk b/cmds/uiautomator/Android.mk deleted file mode 100644 index 53913051e3a9..000000000000 --- a/cmds/uiautomator/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# don't build uiautomator in unbundled env -ifndef TARGET_BUILD_APPS -include $(call all-subdir-makefiles) -else -ifneq ($(filter uiautomator,$(TARGET_BUILD_APPS)),) -# used by the platform apps build. -include $(call all-subdir-makefiles) -endif -endif diff --git a/cmds/uiautomator/api/current.txt b/cmds/uiautomator/api/current.txt index 634ca4d39ec5..489c2eadfd91 100644 --- a/cmds/uiautomator/api/current.txt +++ b/cmds/uiautomator/api/current.txt @@ -171,7 +171,7 @@ package com.android.uiautomator.core { method public com.android.uiautomator.core.UiSelector checked(boolean); method public com.android.uiautomator.core.UiSelector childSelector(com.android.uiautomator.core.UiSelector); method public com.android.uiautomator.core.UiSelector className(java.lang.String); - method public com.android.uiautomator.core.UiSelector className(java.lang.Class<T>); + method public <T> com.android.uiautomator.core.UiSelector className(java.lang.Class<T>); method public com.android.uiautomator.core.UiSelector classNameMatches(java.lang.String); method public com.android.uiautomator.core.UiSelector clickable(boolean); method protected com.android.uiautomator.core.UiSelector cloneSelector(); diff --git a/cmds/uiautomator/cmds/Android.mk b/cmds/uiautomator/cmds/Android.mk deleted file mode 100644 index c141484d81d5..000000000000 --- a/cmds/uiautomator/cmds/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -include $(call all-subdir-makefiles) diff --git a/cmds/uiautomator/cmds/uiautomator/Android.bp b/cmds/uiautomator/cmds/uiautomator/Android.bp new file mode 100644 index 000000000000..68cc5a339107 --- /dev/null +++ b/cmds/uiautomator/cmds/uiautomator/Android.bp @@ -0,0 +1,22 @@ +// +// Copyright (C) 2012 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +java_binary { + name: "uiautomator", + wrapper: "uiautomator", + srcs: ["src/**/*.java"], + static_libs: ["uiautomator.core"], +} diff --git a/cmds/uiautomator/cmds/uiautomator/Android.mk b/cmds/uiautomator/cmds/uiautomator/Android.mk deleted file mode 100644 index 5c91b525b6ea..000000000000 --- a/cmds/uiautomator/cmds/uiautomator/Android.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_STATIC_JAVA_LIBRARIES := uiautomator.core -LOCAL_MODULE := uiautomator - -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := uiautomator -LOCAL_SRC_FILES := uiautomator -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional - -include $(BUILD_PREBUILT) diff --git a/cmds/uiautomator/instrumentation/Android.bp b/cmds/uiautomator/instrumentation/Android.bp new file mode 100644 index 000000000000..477f0d1f6e10 --- /dev/null +++ b/cmds/uiautomator/instrumentation/Android.bp @@ -0,0 +1,33 @@ +// +// Copyright (C) 2012 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +java_test { + name: "uiautomator-instrumentation", + + srcs: [ + "testrunner-src/**/*.java", + ], + libs: [ + "android.test.runner.stubs", + "android.test.base.stubs", + ], + static_libs: [ + "junit", + "uiautomator.library", + ], + // TODO: change this to 18 when it's available + sdk_version: "test_current", +} diff --git a/cmds/uiautomator/instrumentation/Android.mk b/cmds/uiautomator/instrumentation/Android.mk deleted file mode 100644 index e887539b718a..000000000000 --- a/cmds/uiautomator/instrumentation/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE_TAGS := tests -LOCAL_SRC_FILES := $(call all-java-files-under, testrunner-src) \ - $(call all-java-files-under, ../library/core-src) -LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs -LOCAL_STATIC_JAVA_LIBRARIES := junit -LOCAL_MODULE := uiautomator-instrumentation -# TODO: change this to 18 when it's available -LOCAL_SDK_VERSION := current - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/cmds/uiautomator/library/Android.bp b/cmds/uiautomator/library/Android.bp index 77f17c5cfb65..1173d57e5e3f 100644 --- a/cmds/uiautomator/library/Android.bp +++ b/cmds/uiautomator/library/Android.bp @@ -30,6 +30,17 @@ droiddoc { api_tag_name: "UIAUTOMATOR", api_filename: "uiautomator_api.txt", removed_api_filename: "uiautomator_removed_api.txt", + + check_api: { + current: { + api_file: ":uiautomator-current-api", + removed_api_file: ":uiautomator-removed-api", + }, + last_released: { + api_file: ":uiautomator-last-released-api", + removed_api_file: ":uiautomator-removed-api", + }, + }, } java_library_static { @@ -57,3 +68,10 @@ java_library_static { "junit", ] } + +java_library_static { + name: "uiautomator.library", + srcs: [ + "core-src/**/*.java", + ], +} diff --git a/cmds/uiautomator/library/Android.mk b/cmds/uiautomator/library/Android.mk deleted file mode 100644 index 5ca201c9781a..000000000000 --- a/cmds/uiautomator/library/Android.mk +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (C) 2012 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LOCAL_PATH:= $(call my-dir) - -############################################### -# API check -# Please refer to build/core/tasks/apicheck.mk. -uiautomator_api_dir := frameworks/base/cmds/uiautomator/api -last_released_sdk_version := $(lastword $(call numerically_sort, \ - $(filter-out current, \ - $(patsubst $(uiautomator_api_dir)/%.txt,%, $(wildcard $(uiautomator_api_dir)/*.txt)) \ - ))) - -checkapi_last_error_level_flags := \ - -hide 2 -hide 3 -hide 4 -hide 5 -hide 6 -hide 24 -hide 25 \ - -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ - -error 16 -error 17 -error 18 - -# Check that the API we're building hasn't broken the last-released SDK version. -$(eval $(call check-api, \ - uiautomator-checkapi-last, \ - $(uiautomator_api_dir)/$(last_released_sdk_version).txt, \ - $(INTERNAL_PLATFORM_UIAUTOMATOR_API_FILE), \ - $(uiautomator_api_dir)/removed.txt, \ - $(INTERNAL_PLATFORM_UIAUTOMATOR_REMOVED_API_FILE), \ - $(checkapi_last_error_level_flags), \ - cat $(LOCAL_PATH)/apicheck_msg_last.txt, \ - uiautomator.core, \ - $(OUT_DOCS)/uiautomator-stubs-docs-stubs.srcjar)) - -checkapi_current_error_level_flags := \ - -error 2 -error 3 -error 4 -error 5 -error 6 \ - -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \ - -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \ - -error 25 - -# Check that the API we're building hasn't changed from the not-yet-released -# SDK version. -$(eval $(call check-api, \ - uiautomator-checkapi-current, \ - $(uiautomator_api_dir)/current.txt, \ - $(INTERNAL_PLATFORM_UIAUTOMATOR_API_FILE), \ - $(uiautomator_api_dir)/removed.txt, \ - $(INTERNAL_PLATFORM_UIAUTOMATOR_REMOVED_API_FILE), \ - $(checkapi_current_error_level_flags), \ - cat $(LOCAL_PATH)/apicheck_msg_current.txt, \ - uiautomator.core, \ - $(OUT_DOCS)/uiautomator-stubs-docs-stubs.srcjar)) - -.PHONY: update-uiautomator-api -update-uiautomator-api: PRIVATE_API_DIR := $(uiautomator_api_dir) -update-uiautomator-api: PRIVATE_REMOVED_API_FILE := $(INTERNAL_PLATFORM_UIAUTOMATOR_REMOVED_API_FILE) -update-uiautomator-api: $(INTERNAL_PLATFORM_UIAUTOMATOR_API_FILE) - @echo Copying uiautomator current.txt - $(hide) cp $< $(PRIVATE_API_DIR)/current.txt - @echo Copying uiautomator removed.txt - $(hide) cp $(PRIVATE_REMOVED_API_FILE) $(PRIVATE_API_DIR)/removed.txt -############################################### -# clean up temp vars -uiautomator_api_dir := -checkapi_last_error_level_flags := -checkapi_current_error_level_flags := diff --git a/cmds/uiautomator/library/apicheck_msg_current.txt b/cmds/uiautomator/library/apicheck_msg_current.txt deleted file mode 100644 index 989248d78fec..000000000000 --- a/cmds/uiautomator/library/apicheck_msg_current.txt +++ /dev/null @@ -1,17 +0,0 @@ - -****************************** -You have tried to change the API from what has been previously approved. - -To make these errors go away, you have two choices: - 1) You can add "@hide" javadoc comments to the methods, etc. listed in the - errors above. - - 2) You can update current.txt by executing the following command: - make update-uiautomator-api - - To submit the revised current.txt to the main Android repository, - you will need approval. -****************************** - - - diff --git a/cmds/uiautomator/library/apicheck_msg_last.txt b/cmds/uiautomator/library/apicheck_msg_last.txt deleted file mode 100644 index 2993157b165d..000000000000 --- a/cmds/uiautomator/library/apicheck_msg_last.txt +++ /dev/null @@ -1,7 +0,0 @@ - -****************************** -You have tried to change the API from what has been previously released in -an SDK. Please fix the errors listed above. -****************************** - - diff --git a/cmds/vr/Android.bp b/cmds/vr/Android.bp new file mode 100644 index 000000000000..cb129bdf6853 --- /dev/null +++ b/cmds/vr/Android.bp @@ -0,0 +1,8 @@ +// Copyright 2017 The Android Open Source Project +// + +java_binary { + name: "vr", + wrapper: "vr", + srcs: ["**/*.java"], +} diff --git a/cmds/vr/Android.mk b/cmds/vr/Android.mk deleted file mode 100644 index d0dc25a36dc8..000000000000 --- a/cmds/vr/Android.mk +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2017 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_MODULE := vr -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_MODULE := vr -LOCAL_SRC_FILES := vr -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) diff --git a/cmds/wm/Android.bp b/cmds/wm/Android.bp new file mode 100644 index 000000000000..609f84b89bd8 --- /dev/null +++ b/cmds/wm/Android.bp @@ -0,0 +1,7 @@ +// Copyright 2013 The Android Open Source Project +// + +sh_binary { + name: "wm", + src: "wm", +} diff --git a/cmds/wm/Android.mk b/cmds/wm/Android.mk deleted file mode 100644 index 693c6e77d317..000000000000 --- a/cmds/wm/Android.mk +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 2013 The Android Open Source Project -# -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) -LOCAL_MODULE := wm -LOCAL_SRC_FILES := wm -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -include $(BUILD_PREBUILT) |