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/locksettings | |
| 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/locksettings')
| -rw-r--r-- | cmds/locksettings/Android.bp | 19 | ||||
| -rw-r--r-- | cmds/locksettings/Android.mk | 30 |
2 files changed, 19 insertions, 30 deletions
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) - - |