diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-01-12 04:28:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-12 04:28:52 +0000 |
| commit | af0ec78df9c3bbda89dffddc188f60d6e57a4b52 (patch) | |
| tree | 8a86f582612965cd4cbc466a435ab5a12a43037f | |
| parent | a952c9e18ad1a0118be3eb398a9bd1d99285c6e2 (diff) | |
| parent | 66cdfbeb4913eb4fa4d117197dbc0d87091770dc (diff) | |
| download | packages_apps_PhoneCommon-af0ec78df9c3bbda89dffddc188f60d6e57a4b52.tar.gz packages_apps_PhoneCommon-af0ec78df9c3bbda89dffddc188f60d6e57a4b52.tar.bz2 packages_apps_PhoneCommon-af0ec78df9c3bbda89dffddc188f60d6e57a4b52.zip | |
Merge "Convert Android.mk file to Android.bp"
| -rw-r--r-- | Android.bp | 20 | ||||
| -rw-r--r-- | Android.mk | 29 |
2 files changed, 20 insertions, 29 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..9036835 --- /dev/null +++ b/Android.bp @@ -0,0 +1,20 @@ +// Copyright 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. + +android_app { + name: "com.android.phone.common", + srcs: ["src/**/*.java"], + resource_dirs: ["res"], + sdk_version: "current", +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index c181927..0000000 --- a/Android.mk +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 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_USE_AAPT2 := true - -LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_RESOURCE_FILES := $(addprefix $(LOCAL_PATH)/, res) - -LOCAL_PACKAGE_NAME := com.android.phone.common -LOCAL_SDK_VERSION := current - -include $(BUILD_PACKAGE) -include $(CLEAR_VARS) |