diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-02-20 08:06:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-02-20 08:06:18 +0000 |
| commit | 9693364f5258c1473537edc5907f3a80b5afd49a (patch) | |
| tree | 1e50a54ad4ee1df6b9bd8974a8f124ddf29b083e /packages/CompanionDeviceManager | |
| parent | d4455890cb0d51f57545a65bb69d0d121c676bc9 (diff) | |
| parent | df848ac224ae248e41896943ef9f57d6fc54bcb9 (diff) | |
Merge "Convert Android.mk file to Android.bp"
Diffstat (limited to 'packages/CompanionDeviceManager')
| -rw-r--r-- | packages/CompanionDeviceManager/Android.bp | 19 | ||||
| -rw-r--r-- | packages/CompanionDeviceManager/Android.mk | 28 |
2 files changed, 19 insertions, 28 deletions
diff --git a/packages/CompanionDeviceManager/Android.bp b/packages/CompanionDeviceManager/Android.bp new file mode 100644 index 000000000000..a379bfccbe29 --- /dev/null +++ b/packages/CompanionDeviceManager/Android.bp @@ -0,0 +1,19 @@ +// Copyright (C) 2017 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. + +android_app { + name: "CompanionDeviceManager", + srcs: ["src/**/*.java"], + platform_apis: true, +} diff --git a/packages/CompanionDeviceManager/Android.mk b/packages/CompanionDeviceManager/Android.mk deleted file mode 100644 index 7ec6e1146060..000000000000 --- a/packages/CompanionDeviceManager/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) 2017 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_PACKAGE_NAME := CompanionDeviceManager -LOCAL_PRIVATE_PLATFORM_APIS := true - -include $(BUILD_PACKAGE) - -include $(call all-makefiles-under, $(LOCAL_PATH)) |