Merge "Convert frameworks/base/cmds/* to Android.bp"
This commit is contained in:
Colin Cross
@@ -10,3 +10,16 @@ cc_library_host_static {
|
|||||||
export_proto_headers: true,
|
export_proto_headers: true,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "am",
|
||||||
|
wrapper: "am",
|
||||||
|
srcs: [
|
||||||
|
"src/**/*.java",
|
||||||
|
"proto/**/*.proto",
|
||||||
|
],
|
||||||
|
proto: {
|
||||||
|
plugin: "javastream",
|
||||||
|
},
|
||||||
|
static_libs: ["libprotobuf-java-lite"],
|
||||||
|
}
|
||||||
|
|||||||
@@ -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)
|
|
||||||
63
cmds/app_process/Android.bp
Normal file
63
cmds/app_process/Android.bp
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
cc_binary {
|
||||||
|
name: "app_process",
|
||||||
|
|
||||||
|
srcs: ["app_main.cpp"],
|
||||||
|
|
||||||
|
multilib: {
|
||||||
|
lib32: {
|
||||||
|
version_script: ":art_sigchain_version_script32.txt",
|
||||||
|
stem: "app_process32",
|
||||||
|
},
|
||||||
|
lib64: {
|
||||||
|
version_script: ":art_sigchain_version_script64.txt",
|
||||||
|
stem: "app_process64",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
ldflags: ["-Wl,--export-dynamic"],
|
||||||
|
|
||||||
|
shared_libs: [
|
||||||
|
"libandroid_runtime",
|
||||||
|
"libbinder",
|
||||||
|
"libcutils",
|
||||||
|
"libdl",
|
||||||
|
"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,
|
||||||
|
}
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
LOCAL_PATH:= $(call my-dir)
|
|
||||||
|
|
||||||
app_process_common_shared_libs := \
|
|
||||||
libandroid_runtime \
|
|
||||||
libbinder \
|
|
||||||
libcutils \
|
|
||||||
libdl \
|
|
||||||
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.
|
|
||||||
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
|
|
||||||
6
cmds/appops/Android.bp
Normal file
6
cmds/appops/Android.bp
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
// Copyright 2014 The Android Open Source Project
|
||||||
|
|
||||||
|
sh_binary {
|
||||||
|
name: "appops",
|
||||||
|
src: "appops",
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
7
cmds/appwidget/Android.bp
Normal file
7
cmds/appwidget/Android.bp
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
// Copyright 2014 The Android Open Source Project
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "appwidget",
|
||||||
|
wrapper: "appwidget",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
|
|
||||||
8
cmds/bmgr/Android.bp
Normal file
8
cmds/bmgr/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2007 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "bmgr",
|
||||||
|
wrapper: "bmgr",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
8
cmds/bu/Android.bp
Normal file
8
cmds/bu/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2011 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "bu",
|
||||||
|
wrapper: "bu",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
|
|
||||||
|
|
||||||
7
cmds/content/Android.bp
Normal file
7
cmds/content/Android.bp
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
// Copyright 2012 The Android Open Source Project
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "content",
|
||||||
|
wrapper: "content",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
8
cmds/dpm/Android.bp
Normal file
8
cmds/dpm/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2014 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "dpm",
|
||||||
|
wrapper: "dpm",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
@@ -1 +1,9 @@
|
|||||||
subdirs = ["jni"]
|
// Copyright 2015 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "hid",
|
||||||
|
wrapper: "hid",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
required: ["libhidcommand_jni"],
|
||||||
|
}
|
||||||
|
|||||||
@@ -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))
|
|
||||||
7
cmds/ime/Android.bp
Normal file
7
cmds/ime/Android.bp
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
// Copyright 2007 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
sh_binary {
|
||||||
|
name: "ime",
|
||||||
|
src: "ime",
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
8
cmds/input/Android.bp
Normal file
8
cmds/input/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2008 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "input",
|
||||||
|
wrapper: "input",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
19
cmds/locksettings/Android.bp
Normal file
19
cmds/locksettings/Android.bp
Normal file
@@ -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"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
|
|
||||||
|
|
||||||
8
cmds/media/Android.bp
Normal file
8
cmds/media/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2013 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "media",
|
||||||
|
wrapper: "media",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
@@ -3,5 +3,5 @@
|
|||||||
# shell.
|
# shell.
|
||||||
#
|
#
|
||||||
base=/system
|
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 "$@"
|
exec app_process $base/bin com.android.commands.media.Media "$@"
|
||||||
|
|||||||
7
cmds/pm/Android.bp
Normal file
7
cmds/pm/Android.bp
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
// Copyright 2007 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
sh_binary {
|
||||||
|
name: "pm",
|
||||||
|
src: "pm",
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
8
cmds/requestsync/Android.bp
Normal file
8
cmds/requestsync/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2012 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "requestsync",
|
||||||
|
wrapper: "requestsync",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
7
cmds/settings/Android.bp
Normal file
7
cmds/settings/Android.bp
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
// Copyright 2011 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
sh_binary {
|
||||||
|
name: "settings",
|
||||||
|
src: "settings",
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
|
|
||||||
|
|
||||||
8
cmds/sm/Android.bp
Normal file
8
cmds/sm/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2015 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "sm",
|
||||||
|
wrapper: "sm",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
8
cmds/svc/Android.bp
Normal file
8
cmds/svc/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2007 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "svc",
|
||||||
|
wrapper: "svc",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
8
cmds/telecom/Android.bp
Normal file
8
cmds/telecom/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2015 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "telecom",
|
||||||
|
wrapper: "telecom",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
18
cmds/uiautomator/Android.bp
Normal file
18
cmds/uiautomator/Android.bp
Normal file
@@ -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"],
|
||||||
|
}
|
||||||
@@ -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
|
|
||||||
@@ -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)
|
|
||||||
22
cmds/uiautomator/cmds/uiautomator/Android.bp
Normal file
22
cmds/uiautomator/cmds/uiautomator/Android.bp
Normal file
@@ -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"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
33
cmds/uiautomator/instrumentation/Android.bp
Normal file
33
cmds/uiautomator/instrumentation/Android.bp
Normal file
@@ -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",
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
@@ -30,6 +30,17 @@ droiddoc {
|
|||||||
api_tag_name: "UIAUTOMATOR",
|
api_tag_name: "UIAUTOMATOR",
|
||||||
api_filename: "uiautomator_api.txt",
|
api_filename: "uiautomator_api.txt",
|
||||||
removed_api_filename: "uiautomator_removed_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 {
|
java_library_static {
|
||||||
@@ -57,3 +68,10 @@ java_library_static {
|
|||||||
"junit",
|
"junit",
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
java_library_static {
|
||||||
|
name: "uiautomator.library",
|
||||||
|
srcs: [
|
||||||
|
"core-src/**/*.java",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|||||||
@@ -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 :=
|
|
||||||
@@ -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.
|
|
||||||
******************************
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -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.
|
|
||||||
******************************
|
|
||||||
|
|
||||||
|
|
||||||
8
cmds/vr/Android.bp
Normal file
8
cmds/vr/Android.bp
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright 2017 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
java_binary {
|
||||||
|
name: "vr",
|
||||||
|
wrapper: "vr",
|
||||||
|
srcs: ["**/*.java"],
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
7
cmds/wm/Android.bp
Normal file
7
cmds/wm/Android.bp
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
// Copyright 2013 The Android Open Source Project
|
||||||
|
//
|
||||||
|
|
||||||
|
sh_binary {
|
||||||
|
name: "wm",
|
||||||
|
src: "wm",
|
||||||
|
}
|
||||||
@@ -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)
|
|
||||||
@@ -49,3 +49,18 @@ cc_binary_host {
|
|||||||
|
|
||||||
defaults: ["protoc-gen-stream-defaults"],
|
defaults: ["protoc-gen-stream-defaults"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ==========================================================
|
||||||
|
// Build the java test
|
||||||
|
// ==========================================================
|
||||||
|
java_library {
|
||||||
|
name: "StreamingProtoTest",
|
||||||
|
srcs: [
|
||||||
|
"test/**/*.java",
|
||||||
|
"test/**/*.proto",
|
||||||
|
],
|
||||||
|
proto: {
|
||||||
|
plugin: "javastream",
|
||||||
|
},
|
||||||
|
static_libs: ["libprotobuf-java-lite"],
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
#
|
|
||||||
# Copyright (C) 2015 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)
|
|
||||||
|
|
||||||
# ==========================================================
|
|
||||||
# Build the java test
|
|
||||||
# ==========================================================
|
|
||||||
include $(CLEAR_VARS)
|
|
||||||
LOCAL_SRC_FILES := \
|
|
||||||
$(call all-java-files-under, test) \
|
|
||||||
$(call all-proto-files-under, test)
|
|
||||||
LOCAL_MODULE := StreamingProtoTest
|
|
||||||
LOCAL_PROTOC_OPTIMIZE_TYPE := stream
|
|
||||||
include $(BUILD_JAVA_LIBRARY)
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user